[asterisk-commits] russell: trunk r85317 - in /trunk: ./ include/asterisk/file.h

[SVN commits to the Asterisk project]

Author: russell
Date: Wed Oct 10 11:01:31 2007
New Revision: 85317

URL: http://svn.digium.com/view/asterisk?view=rev&rev=85317
Log:
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.

........

Modified:
    trunk/   (props changed)
    trunk/include/asterisk/file.h

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/include/asterisk/file.h
URL: http://svn.digium.com/view/asterisk/trunk/include/asterisk/file.h?view=diff&rev=85317&r1=85316&r2=85317
==============================================================================
--- trunk/include/asterisk/file.h (original)
+++ trunk/include/asterisk/file.h Wed Oct 10 11:01:31 2007
@@ -133,11 +133,11 @@
 	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