| commit | fcfc804e436502d49b2176fec1f40dce3585527f | [log] [tgz] |
|---|---|---|
| author | kjellander <kjellander@webrtc.org> | Thu Jan 14 11:01:09 2016 -0800 |
| committer | Commit bot <commit-bot@chromium.org> | Thu Jan 14 19:01:25 2016 +0000 |
| tree | 24cc77d16648f1b7199d86a69f59e83716078672 | |
| parent | 3542013f587f0858fb24fa8e554ec3c01a323da8 [diff] [blame] |
Eliminate defines in talk/ Replace LINUX, OSX and IOS defines with WEBRTC_ prefixed versions. Remove no longer used defines from talk/build/common.gypi due to previously migrated sources (into webrtc/p2p and webrtc/libjingle). When this is rolled into Chromium, we can also clean up the platform defines in https://code.google.com/p/chromium/codesearch#chromium/src/third_party/libjingle/libjingle.gyp NOTRY=True BUG=webrtc:5420 TESTED=Ran all compile trybots with --clobber flag. TBR=tommi@webrtc.org Review URL: https://codereview.webrtc.org/1588453005 Cr-Commit-Position: refs/heads/master@{#11254}
diff --git a/webrtc/base/unixfilesystem.cc b/webrtc/base/unixfilesystem.cc index 734e880..b474324 100644 --- a/webrtc/base/unixfilesystem.cc +++ b/webrtc/base/unixfilesystem.cc
@@ -373,7 +373,7 @@ return success; #elif defined(__native_client__) return false; -#elif IOS +#elif WEBRTC_IOS IOSAppName(path); return true; #else // WEBRTC_MAC && !defined(WEBRTC_IOS)