merge endian.h (bug #3867)

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/v1-0@6005 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/aesopt.h b/aesopt.h
index 94e3e47f152788e1ce109f4cbf9e41cfbacdc645..d5ae001602064416d08f6ea06d37c8eebd5ba103 100755 (executable)
--- a/aesopt.h
+++ b/aesopt.h
@@ -136,6 +136,7 @@
 #define _AESOPT_H
 
 #include <asterisk/aes.h>
+#include "asterisk/endian.h"
 
 /*  CONFIGURATION - USE OF DEFINES
 
@@ -146,24 +147,6 @@
     #if clauses.
 */
 
-/*  PLATFORM SPECIFIC INCLUDES */
-
-#if defined( __OpenBSD__ )
-#  include <machine/types.h>
-#  include <sys/endian.h>
-#elif defined( __FreeBSD__ ) || defined( __NetBSD__ )
-#  include <sys/types.h>
-#  include <sys/endian.h>
-#elif defined( BSD ) && ( BSD >= 199103 ) || defined(__APPLE__)
-#  include <machine/endian.h>
-#elif defined( __GNUC__ ) || defined( __GNU_LIBRARY__ )
-#  include <endian.h>
-#if !defined(__APPLE__)
-#  include <byteswap.h>
-#endif
-#elif defined( linux )
-#  include <endian.h>
-#endif
 
 /*  BYTE ORDER IN 32-BIT WORDS
 

diff --git a/channels/chan_alsa.c b/channels/chan_alsa.c
index 3da955a6bb9434b60c68bba64901ee37ab29b8ac..481837949da3b1095a4713b8c16d13beb7139f80 100755 (executable)
--- a/channels/chan_alsa.c
+++ b/channels/chan_alsa.c
@@ -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

diff --git a/channels/chan_oss.c b/channels/chan_oss.c
index 57f00665cb19ee5723bbb2a7889a3460663a0597..dbfe53f61724af3106e61ebb16aa0c18978dbc44 100755 (executable)
--- a/channels/chan_oss.c
+++ b/channels/chan_oss.c
@@ -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>

diff --git a/dns.c b/dns.c
index 349bd2ebd73f7da97b17928188dda00798382f22..65a31ac58d6f438da678a366ba6950b95c5d5d7d 100755 (executable)
--- a/dns.c
+++ b/dns.c
@@ -19,6 +19,7 @@
 #include <asterisk/logger.h>
 #include <asterisk/channel.h>
 #include <asterisk/dns.h>
+#include "asterisk/endian.h"
 
 #define MAX_SIZE 4096
 

diff --git a/formats/format_g726.c b/formats/format_g726.c
index 9788a28b47de2cc12b06eef60ca4900f645daa8c..04d3a84df0a931b873b09a288d9acdacd0471d60 100755 (executable)
--- a/formats/format_g726.c
+++ b/formats/format_g726.c
@@ -24,11 +24,7 @@
 #include <unistd.h>
 #include <errno.h>
 #include <string.h>
-#ifdef __linux__
-#include <endian.h>
-#else
-#include <machine/endian.h>
-#endif
+#include "asterisk/endian.h"
 
 #define        RATE_40         0
 #define        RATE_32         1

diff --git a/formats/format_g729.c b/formats/format_g729.c
index 55b5fcbb9ea06463f42b190e61c02ac9392fefc5..3d89d64a885a77470194fa105d246ebe54b197d4 100755 (executable)
--- a/formats/format_g729.c
+++ b/formats/format_g729.c
@@ -25,11 +25,7 @@
 #include <unistd.h>
 #include <errno.h>
 #include <string.h>
-#ifdef __linux__
-#include <endian.h>
-#else
-#include <machine/endian.h>
-#endif
+#include "asterisk/endian.h"
 
 /* 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 f4b5aa1894549d14b63defe1a40916524e511f80..575ef59a35cfb2175a6fc8071845398ab868cd60 100755 (executable)
--- a/formats/format_gsm.c
+++ b/formats/format_gsm.c
@@ -25,11 +25,7 @@
 #include <unistd.h>
 #include <errno.h>
 #include <string.h>
-#ifdef __linux__
-#include <endian.h>
-#else
-#include <machine/endian.h>
-#endif
+#include "asterisk/endian.h"
 #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 1482e5b5d93098be3f8fb0b4d50112d816ed3f02..ee216c31b2e99ece25458c496cefb2a152a371fc 100755 (executable)
--- a/formats/format_h263.c
+++ b/formats/format_h263.c
@@ -25,11 +25,7 @@
 #include <unistd.h>
 #include <errno.h>
 #include <string.h>
-#ifdef __linux__
-#include <endian.h>
-#else
-#include <machine/endian.h>
-#endif
+#include "asterisk/endian.h"
 
 /* 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 61b9d595861a24b974a169279187e996936dbe59..f7cd50ebffd485fc6eb59fe2464e86e0e17521b5 100755 (executable)
--- a/formats/format_ilbc.c
+++ b/formats/format_ilbc.c
@@ -27,11 +27,7 @@
 #include <unistd.h>
 #include <errno.h>
 #include <string.h>
-#ifdef __linux__
-#include <endian.h>
-#else
-#include <machine/endian.h>
-#endif
+#include "asterisk/endian.h"
 
 /* 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 56c5ef8d8092b0cb6e893b76dc0713c0464233ab..6a9432567a8b44afbcdf16e676261f5886a7e50f 100755 (executable)
--- a/formats/format_jpeg.c
+++ b/formats/format_jpeg.c
@@ -27,11 +27,7 @@
 #include <unistd.h>
 #include <errno.h>
 #include <string.h>
-#ifdef __linux__
-#include <endian.h>
-#else
-#include <machine/endian.h>
-#endif
+#include "asterisk/endian.h"
 
 
 static char *desc = "JPEG (Joint Picture Experts Group) Image Format";

diff --git a/formats/format_pcm.c b/formats/format_pcm.c
index a3ad6514348af394ae72834593937345302b3001..fc7b73001f83595aabcfd9c6a958aad3484777a1 100755 (executable)
--- a/formats/format_pcm.c
+++ b/formats/format_pcm.c
@@ -25,11 +25,7 @@
 #include <unistd.h>
 #include <errno.h>
 #include <string.h>
-#ifdef __linux__
-#include <endian.h>
-#else
-#include <machine/endian.h>
-#endif
+#include "asterisk/endian.h"
 
 #define BUF_SIZE 160           /* 160 samples */
 

diff --git a/formats/format_pcm_alaw.c b/formats/format_pcm_alaw.c
index eda446ca4226c2bbd9b698f48b426d21339e34eb..13eb7c06877d8e65a20473f9afb7901130233390 100755 (executable)
--- a/formats/format_pcm_alaw.c
+++ b/formats/format_pcm_alaw.c
@@ -27,11 +27,7 @@
 #include <unistd.h>
 #include <errno.h>
 #include <string.h>
-#ifdef __linux__
-#include <endian.h>
-#else
-#include <machine/endian.h>
-#endif
+#include "asterisk/endian.h"
 
 #define BUF_SIZE 160           /* 160 samples */
 

diff --git a/formats/format_sln.c b/formats/format_sln.c
index 224054775b1ab25c49317f7c2aae47e52596de4e..94a72856560dc6ebb5317cc260ca97af518513bf 100755 (executable)
--- a/formats/format_sln.c
+++ b/formats/format_sln.c
@@ -23,11 +23,7 @@
 #include <unistd.h>
 #include <errno.h>
 #include <string.h>
-#ifdef __linux__
-#include <endian.h>
-#else
-#include <machine/endian.h>
-#endif
+#include "asterisk/endian.h"
 
 #define BUF_SIZE 320           /* 320 samples */
 

diff --git a/formats/format_vox.c b/formats/format_vox.c
index 1a09dac52c82f52bd234cbc011ee5a13bfc13eb4..61f329aaa80d2122a55fcb564cc3df61119c767d 100755 (executable)
--- a/formats/format_vox.c
+++ b/formats/format_vox.c
@@ -25,11 +25,7 @@
 #include <unistd.h>
 #include <errno.h>
 #include <string.h>
-#ifdef __linux__
-#include <endian.h>
-#else
-#include <machine/endian.h>
-#endif
+#include "asterisk/endian.h"
 
 #define BUF_SIZE 80            /* 160 samples */
 

diff --git a/formats/format_wav.c b/formats/format_wav.c
index 0e87f2de9a186f67e53b98d8ae504e966676678b..d0a904be4dd33cb3187396f9d10c67fdb9d9b757 100755 (executable)
--- a/formats/format_wav.c
+++ b/formats/format_wav.c
@@ -25,11 +25,8 @@
 #include <unistd.h>
 #include <errno.h>
 #include <string.h>
-#ifdef __linux__
-#include <endian.h>
-#else
-#include <machine/endian.h>
-#endif
+#include "asterisk/endian.h"
+
 
 /* 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 ad3e24fc850813d8155e054c18833595b718bccc..6039e7d19ecb98cc1d4ddd20351793663d120977 100755 (executable)
--- a/formats/format_wav_gsm.c
+++ b/formats/format_wav_gsm.c
@@ -25,11 +25,7 @@
 #include <unistd.h>
 #include <errno.h>
 #include <string.h>
-#ifdef __linux__
-#include <endian.h>
-#else
-#include <machine/endian.h>
-#endif
+#include "asterisk/endian.h"
 #include "msgsm.h"
 
 /* Some Ideas for this code came from makewave.c by Jeffrey Chilton */

diff --git a/include/asterisk/endian.h b/include/asterisk/endian.h
index f5e20fb07d7fc23addc8f7cf0612ccaeef82aae4..cef9d7ba9d276b1438e67f691ddadca82b1f83be 100755 (executable)
--- a/include/asterisk/endian.h
+++ b/include/asterisk/endian.h
@@ -57,4 +57,3 @@
 #endif /* __BYTE_ORDER */
 
 #endif /* _ASTERISK_ENDIAN_H */
-

diff --git a/include/asterisk/frame.h b/include/asterisk/frame.h
index 0000f9f8384099ce45c81759d63cbe34e9e7198c..0716c953df363950bd6f6c7e84c528eb059293f6 100755 (executable)
--- a/include/asterisk/frame.h
+++ b/include/asterisk/frame.h
@@ -23,40 +23,7 @@ extern "C" {
 #include <sys/types.h>
 #include <sys/time.h>
        
-/*
- * Autodetect system endianess
- */
-#ifndef __BYTE_ORDER
-#ifdef __linux__
-#include <endian.h>
-#elif defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__APPLE__)
-#if defined(__OpenBSD__)
-#include <machine/types.h>
-#endif /* __OpenBSD__ */
-#include <machine/endian.h>
-#define __BYTE_ORDER BYTE_ORDER
-#define __LITTLE_ENDIAN LITTLE_ENDIAN
-#define __BIG_ENDIAN BIG_ENDIAN
-#else
-#ifdef __LITTLE_ENDIAN__
-#define __BYTE_ORDER __LITTLE_ENDIAN
-#endif /* __LITTLE_ENDIAN */
-
-#if defined(i386) || defined(__i386__)
-#define __BYTE_ORDER __LITTLE_ENDIAN
-#endif /* defined i386 */
-
-#if defined(sun) && defined(unix) && defined(sparc)
-#define __BYTE_ORDER __BIG_ENDIAN
-#endif /* sun unix sparc */
-
-#endif /* linux */
-
-#endif /* __BYTE_ORDER */
-
-#ifndef __BYTE_ORDER
-#error Need to know endianess
-#endif /* __BYTE_ORDER */
+#include "asterisk/endian.h"
 
 struct ast_codec_pref {
        char order[32];

diff --git a/md5.c b/md5.c
index 17a00c6fcb0e8ba5c966a404dccca62eefb6c697..ba29ee2559c36759e8714bd4deab0c4bc4bc0c88 100755 (executable)
--- a/md5.c
+++ b/md5.c
@@ -1,16 +1,6 @@
 /* MD5 checksum routines used for authentication.  Not covered by GPL, but
    in the public domain as per the copyright below */
-#if defined( __OpenBSD__ )
-#  include <machine/types.h>
-#  include <sys/endian.h>
-#elif defined( __FreeBSD__ ) || defined( __NetBSD__ )
-#  include <sys/types.h>
-#  include <sys/endian.h>
-#elif defined( BSD ) && ( BSD >= 199103 ) || defined(__APPLE__)
-#  include <machine/endian.h>
-#else
-#  include <endian.h>
-#endif
+#include "asterisk/endian.h"
 # if __BYTE_ORDER == __BIG_ENDIAN || BYTE_ORDER == BIG_ENDIAN
 #  define HIGHFIRST 1
 # endif