[Asterisk-cvs] asterisk/channels chan_alsa.c, 1.27.2.3,
1.27.2.4 chan_oss.c, 1.33.2.2, 1.33.2.3
russell at lists.digium.com
russell at lists.digium.com
Fri Jun 24 18:11:59 CDT 2005
Update of /usr/cvsroot/asterisk/channels
In directory mongoose.digium.com:/tmp/cvs-serv30619/channels
Modified Files:
Tag: v1-0
chan_alsa.c chan_oss.c
Log Message:
merge endian.h (bug #3867)
Index: chan_alsa.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_alsa.c,v
retrieving revision 1.27.2.3
retrieving revision 1.27.2.4
diff -u -d -r1.27.2.3 -r1.27.2.4
--- chan_alsa.c 15 Apr 2005 07:59:59 -0000 1.27.2.3
+++ chan_alsa.c 24 Jun 2005 22:12:25 -0000 1.27.2.4
@@ -27,7 +27,7 @@
#include <string.h>
#include <stdlib.h>
#include <stdio.h>
-#include <endian.h>
+#include "asterisk/endian.h"
#define ALSA_PCM_NEW_HW_PARAMS_API
#define ALSA_PCM_NEW_SW_PARAMS_API
Index: chan_oss.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_oss.c,v
retrieving revision 1.33.2.2
retrieving revision 1.33.2.3
diff -u -d -r1.33.2.2 -r1.33.2.3
--- chan_oss.c 2 Apr 2005 07:59:45 -0000 1.33.2.2
+++ chan_oss.c 24 Jun 2005 22:12:25 -0000 1.33.2.3
@@ -35,22 +35,7 @@
#include <stdlib.h>
#include <stdio.h>
-#if defined( __OpenBSD__ )
-# include <sys/endian.h>
-#elif defined( __FreeBSD__ ) || defined( __NetBSD__ )
-# include <sys/endian.h>
-#elif defined( BSD ) && ( BSD >= 199103 ) || defined(__APPLE__)
-# include <machine/endian.h>
-#elif defined ( SOLARIS )
-# include <solaris-compat/compat.h>
-#elif defined( __GNUC__ ) || defined( __GNU_LIBRARY__ )
-# include <endian.h>
-#if !defined(__APPLE__)
-# include <byteswap.h>
-#endif
-#elif defined( linux )
-# include <endian.h>
-#endif
+#include "asterisk/endian.h"
#ifdef __linux
#include <linux/soundcard.h>
More information about the svn-commits
mailing list