[Asterisk-cvs] asterisk/formats format_g726.c, 1.5, 1.6 format_g729.c, 1.13, 1.14 format_gsm.c, 1.18, 1.19 format_h263.c, 1.7, 1.8 format_ilbc.c, 1.6, 1.7 format_jpeg.c, 1.6, 1.7 format_pcm.c, 1.15, 1.16 format_pcm_alaw.c, 1.13, 1.14 format_sln.c, 1.2, 1.3 format_vox.c, 1.17, 1.18 format_wav.c, 1.19, 1.20 format_wav_gsm.c, 1.26, 1.27

markster at lists.digium.com markster at lists.digium.com
Tue Dec 14 18:39:44 CST 2004


Update of /usr/cvsroot/asterisk/formats
In directory mongoose.digium.com:/tmp/cvs-serv25047/formats

Modified Files:
	format_g726.c format_g729.c format_gsm.c format_h263.c 
	format_ilbc.c format_jpeg.c format_pcm.c format_pcm_alaw.c 
	format_sln.c format_vox.c format_wav.c format_wav_gsm.c 
Log Message:
Merge slimey's Solaris compatibility (with small mods) (bug #2740)


Index: format_g726.c
===================================================================
RCS file: /usr/cvsroot/asterisk/formats/format_g726.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- format_g726.c	13 Nov 2004 16:13:07 -0000	1.5
+++ format_g726.c	14 Dec 2004 23:36:30 -0000	1.6
@@ -27,8 +27,12 @@
 #ifdef __linux__
 #include <endian.h>
 #else
+#ifdef SOLARIS
+#include "solaris-compat/compat.h"
+#else
 #include <machine/endian.h>
 #endif
+#endif
 
 #define	RATE_40		0
 #define	RATE_32		1

Index: format_g729.c
===================================================================
RCS file: /usr/cvsroot/asterisk/formats/format_g729.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- format_g729.c	13 Nov 2004 16:13:07 -0000	1.13
+++ format_g729.c	14 Dec 2004 23:36:30 -0000	1.14
@@ -28,8 +28,12 @@
 #ifdef __linux__
 #include <endian.h>
 #else
+#ifdef SOLARIS
+#include "solaris-compat/compat.h"
+#else
 #include <machine/endian.h>
 #endif
+#endif
 
 /* Some Ideas for this code came from makeg729e.c by Jeffrey Chilton */
 

Index: format_gsm.c
===================================================================
RCS file: /usr/cvsroot/asterisk/formats/format_gsm.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- format_gsm.c	13 Nov 2004 16:13:07 -0000	1.18
+++ format_gsm.c	14 Dec 2004 23:36:30 -0000	1.19
@@ -28,8 +28,12 @@
 #ifdef __linux__
 #include <endian.h>
 #else
+#ifdef SOLARIS
+#include "solaris-compat/compat.h"
+#else
 #include <machine/endian.h>
 #endif
+#endif
 #include "msgsm.h"
 
 /* Some Ideas for this code came from makegsme.c by Jeffrey Chilton */

Index: format_h263.c
===================================================================
RCS file: /usr/cvsroot/asterisk/formats/format_h263.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- format_h263.c	13 Nov 2004 16:13:07 -0000	1.7
+++ format_h263.c	14 Dec 2004 23:36:30 -0000	1.8
@@ -28,8 +28,12 @@
 #ifdef __linux__
 #include <endian.h>
 #else
+#ifdef SOLARIS
+#include "solaris-compat/compat.h"
+#else
 #include <machine/endian.h>
 #endif
+#endif
 
 /* Some Ideas for this code came from makeh263e.c by Jeffrey Chilton */
 

Index: format_ilbc.c
===================================================================
RCS file: /usr/cvsroot/asterisk/formats/format_ilbc.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- format_ilbc.c	13 Nov 2004 16:13:07 -0000	1.6
+++ format_ilbc.c	14 Dec 2004 23:36:30 -0000	1.7
@@ -30,8 +30,12 @@
 #ifdef __linux__
 #include <endian.h>
 #else
+#ifdef SOLARIS
+#include "solaris-compat/compat.h"
+#else
 #include <machine/endian.h>
 #endif
+#endif
 
 /* Some Ideas for this code came from makeg729e.c by Jeffrey Chilton */
 

Index: format_jpeg.c
===================================================================
RCS file: /usr/cvsroot/asterisk/formats/format_jpeg.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- format_jpeg.c	22 Jun 2004 18:49:00 -0000	1.6
+++ format_jpeg.c	14 Dec 2004 23:36:30 -0000	1.7
@@ -30,8 +30,12 @@
 #ifdef __linux__
 #include <endian.h>
 #else
+#ifdef SOLARIS
+#include "solaris-compat/compat.h"
+#else
 #include <machine/endian.h>
 #endif
+#endif
 
 
 static char *desc = "JPEG (Joint Picture Experts Group) Image Format";

Index: format_pcm.c
===================================================================
RCS file: /usr/cvsroot/asterisk/formats/format_pcm.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- format_pcm.c	13 Nov 2004 16:13:07 -0000	1.15
+++ format_pcm.c	14 Dec 2004 23:36:30 -0000	1.16
@@ -28,8 +28,12 @@
 #ifdef __linux__
 #include <endian.h>
 #else
+#ifdef SOLARIS
+#include "solaris-compat/compat.h"
+#else
 #include <machine/endian.h>
 #endif
+#endif
 
 #define BUF_SIZE 160		/* 160 samples */
 

Index: format_pcm_alaw.c
===================================================================
RCS file: /usr/cvsroot/asterisk/formats/format_pcm_alaw.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- format_pcm_alaw.c	13 Nov 2004 16:13:07 -0000	1.13
+++ format_pcm_alaw.c	14 Dec 2004 23:36:30 -0000	1.14
@@ -30,8 +30,12 @@
 #ifdef __linux__
 #include <endian.h>
 #else
+#ifdef SOLARIS
+#include "solaris-compat/compat.h"
+#else
 #include <machine/endian.h>
 #endif
+#endif
 
 #define BUF_SIZE 160		/* 160 samples */
 

Index: format_sln.c
===================================================================
RCS file: /usr/cvsroot/asterisk/formats/format_sln.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- format_sln.c	13 Nov 2004 16:13:07 -0000	1.2
+++ format_sln.c	14 Dec 2004 23:36:30 -0000	1.3
@@ -26,8 +26,12 @@
 #ifdef __linux__
 #include <endian.h>
 #else
+#ifdef SOLARIS
+#include "solaris-compat/compat.h"
+#else
 #include <machine/endian.h>
 #endif
+#endif
 
 #define BUF_SIZE 320		/* 320 samples */
 

Index: format_vox.c
===================================================================
RCS file: /usr/cvsroot/asterisk/formats/format_vox.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- format_vox.c	13 Nov 2004 16:13:07 -0000	1.17
+++ format_vox.c	14 Dec 2004 23:36:30 -0000	1.18
@@ -28,8 +28,12 @@
 #ifdef __linux__
 #include <endian.h>
 #else
+#ifdef SOLARIS
+#include "solaris-compat/compat.h"
+#else
 #include <machine/endian.h>
 #endif
+#endif
 
 #define BUF_SIZE 80		/* 160 samples */
 

Index: format_wav.c
===================================================================
RCS file: /usr/cvsroot/asterisk/formats/format_wav.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- format_wav.c	13 Nov 2004 16:13:07 -0000	1.19
+++ format_wav.c	14 Dec 2004 23:36:30 -0000	1.20
@@ -28,8 +28,12 @@
 #ifdef __linux__
 #include <endian.h>
 #else
+#ifdef SOLARIS
+#include "solaris-compat/compat.h"
+#else
 #include <machine/endian.h>
 #endif
+#endif
 
 /* Some Ideas for this code came from makewave.c by Jeffrey Chilton */
 

Index: format_wav_gsm.c
===================================================================
RCS file: /usr/cvsroot/asterisk/formats/format_wav_gsm.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- format_wav_gsm.c	13 Nov 2004 16:13:07 -0000	1.26
+++ format_wav_gsm.c	14 Dec 2004 23:36:30 -0000	1.27
@@ -28,8 +28,12 @@
 #ifdef __linux__
 #include <endian.h>
 #else
+#ifdef SOLARIS
+#include "solaris-compat/compat.h"
+#else
 #include <machine/endian.h>
 #endif
+#endif
 #include "msgsm.h"
 
 /* Some Ideas for this code came from makewave.c by Jeffrey Chilton */




More information about the svn-commits mailing list