From 3a25d0b20c56e464f62e61552aac669f9748d027 Mon Sep 17 00:00:00 2001 From: Sebastian Kemper Date: Tue, 13 Dec 2016 20:30:45 +0100 Subject: [PATCH] FS-9840 mod_sofia: fix redefine warning This fixes the following compile-time warning: make[8]: Entering directory '/home/sk/tmp/lede/build_dir/target-mips_24kc_musl-1.1.15/freeswitch-1.8.0/src/mod/endpoints/mod_sofia' CC mod_sofia_la-mod_sofia.lo CC mod_sofia_la-sofia.lo CC mod_sofia_la-sofia_glue.lo CC mod_sofia_la-sofia_presence.lo CC mod_sofia_la-sofia_reg.lo CC mod_sofia_la-sofia_media.lo CC mod_sofia_la-sip-dig.lo In file included from sip-dig.c:137:0: /home/sk/tmp/lede/build_dir/target-mips_24kc_musl-1.1.15/freeswitch-1.8.0/libs/sofia-sip/libsofia-sip-ua/bnf/../../config.h:522:0: error: "__BYTE_ORDER" redefined [-Werror] #define __BYTE_ORDER __BIG_ENDIAN ^ In file included from /home/sk/tmp/lede/staging_dir/toolchain-mips_24kc_gcc-5.4.0_musl-1.1.15/include/sys/types.h:70:0, from ../../../../src/include/switch.h:107, from sip-dig.c:135: /home/sk/tmp/lede/staging_dir/toolchain-mips_24kc_gcc-5.4.0_musl-1.1.15/include/endian.h:11:0: note: this is the location of the previous definition #define __BYTE_ORDER __BYTE_ORDER__ ^ cc1: all warnings being treated as errors SWITCH_BYTE_ORDER is already used elsewhere in FS source and takes care of changing byte order without causing a warning Signed-off-by: Sebastian Kemper --- libs/sofia-sip/configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/sofia-sip/configure.ac b/libs/sofia-sip/configure.ac index ca6bd3a82e..9542208cb6 100644 --- a/libs/sofia-sip/configure.ac +++ b/libs/sofia-sip/configure.ac @@ -218,7 +218,7 @@ fi AC_C_CONST AC_C_INLINE AC_C_INLINE_DEFINE -AC_C_BIGENDIAN(AC_DEFINE([__BYTE_ORDER],__BIG_ENDIAN,[Big Endian]),AC_DEFINE([__BYTE_ORDER],__LITTLE_ENDIAN,[Little Endian])) +AC_C_BIGENDIAN(AC_DEFINE([SWITCH_BYTE_ORDER],__BIG_ENDIAN,[Big Endian]),AC_DEFINE([SWITCH_BYTE_ORDER],__LITTLE_ENDIAN,[Little Endian])) AC_C_VAR_FUNC AC_C_MACRO_FUNCTION