generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Only use -lm on Linux in ISAC.

Browse Source 
Remove unneeded WEBRTC_LINUX define.

BUG=crbug.com/298656
TESTED=Passed trybots.
R=wjia@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/2313004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@4865 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
andrew@webrtc.org
2013-09-27 18:16:28 +00:00
parent 287f07b174
commit 137b3793d9
2 changed files with 8 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
webrtc/modules/audio_coding/codecs/isac/main/source/isac.gypi
View File

@@ -73,18 +73,13 @@
'structs.h', 'structs.h',
'os_specific_inline.h', 'os_specific_inline.h',
], ],
'conditions': [ 'conditions': [
['OS!="win"', { ['OS=="linux"', {
'defines': [ 'link_settings': {
'WEBRTC_LINUX', 'libraries': ['-lm',],
], },
'link_settings': { }],
'libraries': [ ],
'-lm',
],
},
}],
],
}, },
], ],
} }

3
webrtc/modules/audio_coding/codecs/isac/main/source/os_specific_inline.h
View File

@@ -15,8 +15,7 @@
#include <math.h> #include <math.h>
#include "typedefs.h" #include "typedefs.h"
// TODO(turaj): switch to WEBRTC_POSIX when available #if defined(WEBRTC_POSIX)
#if defined(WEBRTC_LINUX) || defined(WEBRTC_MAC)
#define WebRtcIsac_lrint lrint #define WebRtcIsac_lrint lrint
#elif (defined(WEBRTC_ARCH_X86) && defined(WIN32)) #elif (defined(WEBRTC_ARCH_X86) && defined(WIN32))
static __inline long int WebRtcIsac_lrint(double x_dbl) { static __inline long int WebRtcIsac_lrint(double x_dbl) {