From: Alexander Traud Date: Thu, 21 Jun 2018 10:08:56 +0000 (+0200) Subject: codecs/ilbc: Compile in Solaris 11. X-Git-Tag: 13.22.0-rc1~18^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=81f39649ea271d46543209faaa2f954a216617da;p=thirdparty%2Fasterisk.git codecs/ilbc: Compile in Solaris 11. The symbol FS is the sampling frequency. That symbol is not used in Asterisk at all and was a copy-and-paste of the iLBC reference code from the IETF RFC. However, in Solaris, that symbol is defined by another header already. To compile in Solaris, that symbol has to go. Change-Id: I91ddbe5be7c00069c3a25abd5f58d7b2f04c51b1 --- diff --git a/codecs/ilbc/iLBC_define.h b/codecs/ilbc/iLBC_define.h index 09b120e982..eb254a0fb2 100644 --- a/codecs/ilbc/iLBC_define.h +++ b/codecs/ilbc/iLBC_define.h @@ -16,7 +16,6 @@ /* general codec settings */ - #define FS (float)8000.0 #define BLOCKL_20MS 160 #define BLOCKL_30MS 240 #define BLOCKL_MAX 240