diff options
| author | nick@chromium.org <nick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-25 23:06:46 +0000 |
|---|---|---|
| committer | nick@chromium.org <nick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-25 23:06:46 +0000 |
| commit | b17b3c8b37c0acd4528a338583f851a5a10063b0 (patch) | |
| tree | 0e57c909cf032c3acd6dfa9e1a3a38df0fa62c22 | |
| parent | c2b99a98d9b2e7de9ebc48ab0b72608145613576 (diff) | |
| download | chromium_src-b17b3c8b37c0acd4528a338583f851a5a10063b0.zip chromium_src-b17b3c8b37c0acd4528a338583f851a5a10063b0.tar.gz chromium_src-b17b3c8b37c0acd4528a338583f851a5a10063b0.tar.bz2 | |
Remove COMPILER_MSVC flags from gyp files. When we do need it, we can
get it from the build/build_config.h.
TEST=unit tests
BUG=none
Review URL: http://codereview.chromium.org/248004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@27280 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/chrome.gyp | 12 | ||||
| -rw-r--r-- | third_party/libjingle/libjingle.gyp | 3 | ||||
| -rw-r--r-- | third_party/libjingle/overrides/talk/base/basictypes.h | 1 |
3 files changed, 1 insertions, 15 deletions
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp index 1282b40..4b37d3d 100644 --- a/chrome/chrome.gyp +++ b/chrome/chrome.gyp @@ -4597,9 +4597,6 @@ ], 'conditions': [ ['OS=="win"', { - 'defines' : [ - 'COMPILER_MSVC', - ], 'msvs_settings': { 'VCLinkerTool': { 'ImportLibrary': '$(OutDir)\\lib\\syncapi.lib', @@ -6411,9 +6408,6 @@ ], 'conditions': [ ['OS=="win"', { - 'defines' : [ - 'COMPILER_MSVC', - ], 'dependencies': [ '../third_party/pthreads-win32/pthreads.gyp:pthreads', ], @@ -6478,9 +6472,6 @@ ], 'conditions': [ ['OS=="win"', { - 'defines' : [ - 'COMPILER_MSVC', - ], 'dependencies': [ '../third_party/pthreads-win32/pthreads.gyp:pthreads', ], @@ -6647,9 +6638,6 @@ 'browser/sync/util/data_encryption.h', 'browser/sync/util/path_helpers.cc', ], - 'defines' : [ - 'COMPILER_MSVC', - ], 'dependencies': [ '../third_party/pthreads-win32/pthreads.gyp:pthreads', ], diff --git a/third_party/libjingle/libjingle.gyp b/third_party/libjingle/libjingle.gyp index dcbfb3f..dc8f106 100644 --- a/third_party/libjingle/libjingle.gyp +++ b/third_party/libjingle/libjingle.gyp @@ -32,9 +32,6 @@ }, 'conditions': [ ['OS=="win"', { - 'defines': [ - 'COMPILER_MSVC', - ], 'include_dirs': [ '../third_party/platformsdk_win2008_6_1/files/Include', ], diff --git a/third_party/libjingle/overrides/talk/base/basictypes.h b/third_party/libjingle/overrides/talk/base/basictypes.h index ab42029..2d21d80 100644 --- a/third_party/libjingle/overrides/talk/base/basictypes.h +++ b/third_party/libjingle/overrides/talk/base/basictypes.h @@ -10,6 +10,7 @@ #define OVERRIDES_TALK_BASE_BASICTYPES_H__ #include "base/basictypes.h" +#include "build/build_config.h" #ifndef INT_TYPES_DEFINED #define INT_TYPES_DEFINED |