From: Russell Bryant <russell@russellbryant.com>
Date: Wed, 10 Oct 2007 16:01:31 +0000 (+0000)
Subject: Merged revisions 85316 via svnmerge from
X-Git-Tag: 1.6.0-beta1~3^2~1235
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a6507769ca75f3e7ecec5948430b7f6bd7a0b06e;p=thirdparty%2Fasterisk.git

Merged revisions 85316 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r85316 | russell | 2007-10-10 10:56:23 -0500 (Wed, 10 Oct 2007) | 6 lines

I introduced a new member to the ast_filestream struct in 1.4.12, but put it
in the middle of the struct, instead of at the end.  One of the Debian folks,
paravoid, pointed out that this breaks binary compatability with modules
compiled against older headers.  So, I'm moving the new member to the end
of the struct to resolve the situation.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@85317 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/include/asterisk/file.h b/include/asterisk/file.h
index 24796076dd..a93b58915c 100644
--- a/include/asterisk/file.h
+++ b/include/asterisk/file.h
@@ -133,11 +133,11 @@ struct ast_filestream {
 	int lastwriteformat;
 	int lasttimeout;
 	struct ast_channel *owner;
-	const char *orig_chan_name;
 	FILE *f;
 	struct ast_frame fr;	/*!< frame produced by read, typically */
 	char *buf;		/*!< buffer pointed to by ast_frame; */
 	void *private;	/*!< pointer to private buffer */
+	const char *orig_chan_name;
 };
 
 #define SEEK_FORCECUR	10