summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrnk@chromium.org <rnk@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-05-31 02:02:44 +0000
committerrnk@chromium.org <rnk@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-05-31 02:02:44 +0000
commit8d1d1a26aa29eb572a29ed6d5ff131eccdf31d89 (patch)
tree24bfb72456eaf8450e214cdd8a6be28ced46116f
parenta1ce87dd4618455fbf4b83fe720c85c5c5815ca3 (diff)
downloadchromium_src-8d1d1a26aa29eb572a29ed6d5ff131eccdf31d89.zip
chromium_src-8d1d1a26aa29eb572a29ed6d5ff131eccdf31d89.tar.gz
chromium_src-8d1d1a26aa29eb572a29ed6d5ff131eccdf31d89.tar.bz2
usrsctp: Filter out Chrome's WINVER macros to avoid -Wmacro-redefined
R=ronghuawu@chromium.org BUG=82385 Review URL: https://codereview.chromium.org/292063003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@273990 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--third_party/usrsctp/usrsctp.gyp5
1 files changed, 5 insertions, 0 deletions
diff --git a/third_party/usrsctp/usrsctp.gyp b/third_party/usrsctp/usrsctp.gyp
index f97cc63..0061c1e 100644
--- a/third_party/usrsctp/usrsctp.gyp
+++ b/third_party/usrsctp/usrsctp.gyp
@@ -152,6 +152,11 @@
'WINVER=0x0502',
'_WIN32_WINNT=0x0502',
],
+ 'defines!': [
+ # Remove Chrome's WINVER defines to avoid redefinition warnings.
+ 'WINVER=0x0602',
+ '_WIN32_WINNT=0x0602',
+ ],
'cflags!': [ '/W3', '/WX' ],
'cflags': [ '/w' ],
# TODO(ldixon) : Remove this disabling of warnings by pushing a