From 137b3793d9a73adc4b730a8ed18a7b009ea4aa59 Mon Sep 17 00:00:00 2001
From: "andrew@webrtc.org"
 <andrew@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d>
Date: Fri, 27 Sep 2013 18:16:28 +0000
Subject: [PATCH] Only use -lm on Linux in ISAC.

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
---
 .../codecs/isac/main/source/isac.gypi         | 19 +++++++------------
 .../isac/main/source/os_specific_inline.h     |  3 +--
 2 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/webrtc/modules/audio_coding/codecs/isac/main/source/isac.gypi b/webrtc/modules/audio_coding/codecs/isac/main/source/isac.gypi
index 3d4859832..f6c33398e 100644
--- a/webrtc/modules/audio_coding/codecs/isac/main/source/isac.gypi
+++ b/webrtc/modules/audio_coding/codecs/isac/main/source/isac.gypi
@@ -73,18 +73,13 @@
         'structs.h',
         'os_specific_inline.h',
      ],
-      'conditions': [
-        ['OS!="win"', {
-          'defines': [
-            'WEBRTC_LINUX',
-          ],
-          'link_settings': {
-            'libraries': [
-              '-lm',
-            ],
-          },
-        }],
-      ],
+     'conditions': [
+       ['OS=="linux"', {
+         'link_settings': {
+           'libraries': ['-lm',],
+         },
+       }],
+     ],
     },
   ],
 }
diff --git a/webrtc/modules/audio_coding/codecs/isac/main/source/os_specific_inline.h b/webrtc/modules/audio_coding/codecs/isac/main/source/os_specific_inline.h
index c469c2ec9..891c67ccd 100644
--- a/webrtc/modules/audio_coding/codecs/isac/main/source/os_specific_inline.h
+++ b/webrtc/modules/audio_coding/codecs/isac/main/source/os_specific_inline.h
@@ -15,8 +15,7 @@
 #include <math.h>
 #include "typedefs.h"
 
-// TODO(turaj): switch to WEBRTC_POSIX when available
-#if defined(WEBRTC_LINUX) || defined(WEBRTC_MAC)
+#if defined(WEBRTC_POSIX)
 #define WebRtcIsac_lrint lrint
 #elif (defined(WEBRTC_ARCH_X86) && defined(WIN32))
 static __inline long int WebRtcIsac_lrint(double x_dbl) {