From 70cedacdde512d2ed5984eec242c55f3239b73fc Mon Sep 17 00:00:00 2001 From: markster Date: Tue, 14 Dec 2004 23:36:30 +0000 Subject: Merge slimey's Solaris compatibility (with small mods) (bug #2740) git-svn-id: http://svn.digium.com/svn/asterisk/trunk@4446 f38db490-d61c-443f-a65b-d21fe96a405b --- formats/format_g726.c | 4 ++++ formats/format_g729.c | 4 ++++ formats/format_gsm.c | 4 ++++ formats/format_h263.c | 4 ++++ formats/format_ilbc.c | 4 ++++ formats/format_jpeg.c | 4 ++++ formats/format_pcm.c | 4 ++++ formats/format_pcm_alaw.c | 4 ++++ formats/format_sln.c | 4 ++++ formats/format_vox.c | 4 ++++ formats/format_wav.c | 4 ++++ formats/format_wav_gsm.c | 4 ++++ 12 files changed, 48 insertions(+) (limited to 'formats') diff --git a/formats/format_g726.c b/formats/format_g726.c index 172b4cd41..16c45b765 100755 --- a/formats/format_g726.c +++ b/formats/format_g726.c @@ -27,8 +27,12 @@ #ifdef __linux__ #include #else +#ifdef SOLARIS +#include "solaris-compat/compat.h" +#else #include #endif +#endif #define RATE_40 0 #define RATE_32 1 diff --git a/formats/format_g729.c b/formats/format_g729.c index be41781dd..7c268996b 100755 --- a/formats/format_g729.c +++ b/formats/format_g729.c @@ -28,8 +28,12 @@ #ifdef __linux__ #include #else +#ifdef SOLARIS +#include "solaris-compat/compat.h" +#else #include #endif +#endif /* Some Ideas for this code came from makeg729e.c by Jeffrey Chilton */ diff --git a/formats/format_gsm.c b/formats/format_gsm.c index a51ee0262..cb1a7ab0d 100755 --- a/formats/format_gsm.c +++ b/formats/format_gsm.c @@ -28,8 +28,12 @@ #ifdef __linux__ #include #else +#ifdef SOLARIS +#include "solaris-compat/compat.h" +#else #include #endif +#endif #include "msgsm.h" /* Some Ideas for this code came from makegsme.c by Jeffrey Chilton */ diff --git a/formats/format_h263.c b/formats/format_h263.c index d2e2e76e5..17805b231 100755 --- a/formats/format_h263.c +++ b/formats/format_h263.c @@ -28,8 +28,12 @@ #ifdef __linux__ #include #else +#ifdef SOLARIS +#include "solaris-compat/compat.h" +#else #include #endif +#endif /* Some Ideas for this code came from makeh263e.c by Jeffrey Chilton */ diff --git a/formats/format_ilbc.c b/formats/format_ilbc.c index 5b47ddc67..f92018cf2 100755 --- a/formats/format_ilbc.c +++ b/formats/format_ilbc.c @@ -30,8 +30,12 @@ #ifdef __linux__ #include #else +#ifdef SOLARIS +#include "solaris-compat/compat.h" +#else #include #endif +#endif /* Some Ideas for this code came from makeg729e.c by Jeffrey Chilton */ diff --git a/formats/format_jpeg.c b/formats/format_jpeg.c index 56c5ef8d8..b08403009 100755 --- a/formats/format_jpeg.c +++ b/formats/format_jpeg.c @@ -30,8 +30,12 @@ #ifdef __linux__ #include #else +#ifdef SOLARIS +#include "solaris-compat/compat.h" +#else #include #endif +#endif static char *desc = "JPEG (Joint Picture Experts Group) Image Format"; diff --git a/formats/format_pcm.c b/formats/format_pcm.c index 3e037ca95..6d0127177 100755 --- a/formats/format_pcm.c +++ b/formats/format_pcm.c @@ -28,8 +28,12 @@ #ifdef __linux__ #include #else +#ifdef SOLARIS +#include "solaris-compat/compat.h" +#else #include #endif +#endif #define BUF_SIZE 160 /* 160 samples */ diff --git a/formats/format_pcm_alaw.c b/formats/format_pcm_alaw.c index d828aedcc..866cd2360 100755 --- a/formats/format_pcm_alaw.c +++ b/formats/format_pcm_alaw.c @@ -30,8 +30,12 @@ #ifdef __linux__ #include #else +#ifdef SOLARIS +#include "solaris-compat/compat.h" +#else #include #endif +#endif #define BUF_SIZE 160 /* 160 samples */ diff --git a/formats/format_sln.c b/formats/format_sln.c index 0a52c10f0..639905e01 100755 --- a/formats/format_sln.c +++ b/formats/format_sln.c @@ -26,8 +26,12 @@ #ifdef __linux__ #include #else +#ifdef SOLARIS +#include "solaris-compat/compat.h" +#else #include #endif +#endif #define BUF_SIZE 320 /* 320 samples */ diff --git a/formats/format_vox.c b/formats/format_vox.c index 78afc6598..7601994fd 100755 --- a/formats/format_vox.c +++ b/formats/format_vox.c @@ -28,8 +28,12 @@ #ifdef __linux__ #include #else +#ifdef SOLARIS +#include "solaris-compat/compat.h" +#else #include #endif +#endif #define BUF_SIZE 80 /* 160 samples */ diff --git a/formats/format_wav.c b/formats/format_wav.c index 375553913..be6053447 100755 --- a/formats/format_wav.c +++ b/formats/format_wav.c @@ -28,8 +28,12 @@ #ifdef __linux__ #include #else +#ifdef SOLARIS +#include "solaris-compat/compat.h" +#else #include #endif +#endif /* Some Ideas for this code came from makewave.c by Jeffrey Chilton */ diff --git a/formats/format_wav_gsm.c b/formats/format_wav_gsm.c index c46c819dd..a34ae929d 100755 --- a/formats/format_wav_gsm.c +++ b/formats/format_wav_gsm.c @@ -28,8 +28,12 @@ #ifdef __linux__ #include #else +#ifdef SOLARIS +#include "solaris-compat/compat.h" +#else #include #endif +#endif #include "msgsm.h" /* Some Ideas for this code came from makewave.c by Jeffrey Chilton */ -- cgit v1.2.3