[Pkg-voip-commits] r5031 - in /asterisk/trunk/debian/patches: keep-1.4-abi series

[paravoid at alioth.debian.org]

Author: paravoid
Date: Tue Dec  4 21:52:23 2007
New Revision: 5031

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=5031
Log:
Don't break the API either way

Added:
    asterisk/trunk/debian/patches/keep-1.4-abi
Modified:
    asterisk/trunk/debian/patches/series

Added: asterisk/trunk/debian/patches/keep-1.4-abi
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/keep-1.4-abi?rev=5031&op=file
==============================================================================
--- asterisk/trunk/debian/patches/keep-1.4-abi (added)
+++ asterisk/trunk/debian/patches/keep-1.4-abi Tue Dec  4 21:52:23 2007
@@ -1,0 +1,26 @@
+1.4.15 broke the API by renaming ast_filestream member from private to
+_private for better C++ compatibility.
+
+Fix this but also be forward-compatible and C++ friendly.
+i.e. do what it should have been done by Digium in the first place.
+
+ -- Faidon Liambotis <paravoid at debian.org>
+
+--- a/include/asterisk/file.h
++++ b/include/asterisk/file.h
+@@ -132,7 +132,14 @@ struct ast_filestream {
+ 	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 */
++	/* pointer to private buffer */
++	union {
++		void *_private;
++#ifndef __cplusplus
++		/* be compatible with <= 1.4.14 */
++		void *private;
++#endif
++	};
+ 	const char *orig_chan_name;
+ };
+ 

Modified: asterisk/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/series?rev=5031&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/series (original)
+++ asterisk/trunk/debian/patches/series Tue Dec  4 21:52:23 2007
@@ -1,5 +1,6 @@
 # upstream fixes
 debian-banner
+keep-1.4-abi
 disable-build-sum
 configure-libc-client
 hack-multiple-app-voicemail