Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(76)

Side by Side Diff: third_party/usrsctp/usrsctp.gyp

Issue 292063003: usrsctp: Filter out Chrome's WINVER macros to avoid -Wmacro-redefined (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 { 4 {
5 'variables': { 5 'variables': {
6 'libsctp_target_type%': 'static_library', 6 'libsctp_target_type%': 'static_library',
7 }, 7 },
8 'target_defaults': { 8 'target_defaults': {
9 'defines': [ 9 'defines': [
10 'SCTP_PROCESS_LEVEL_LOCKS', 10 'SCTP_PROCESS_LEVEL_LOCKS',
(...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after
145 }], 145 }],
146 ['OS=="win"', { 146 ['OS=="win"', {
147 'defines': [ 147 'defines': [
148 '__Userspace_os_Windows', 148 '__Userspace_os_Windows',
149 # Manually setting WINVER and _WIN32_WINNT is needed because Chrome 149 # Manually setting WINVER and _WIN32_WINNT is needed because Chrome
150 # sets WINVER to a newer version of windows. But compiling usrsctp 150 # sets WINVER to a newer version of windows. But compiling usrsctp
151 # this way would is incompatible with windows XP. 151 # this way would is incompatible with windows XP.
152 'WINVER=0x0502', 152 'WINVER=0x0502',
153 '_WIN32_WINNT=0x0502', 153 '_WIN32_WINNT=0x0502',
154 ], 154 ],
155 'defines!': [
156 # Remove Chrome's WINVER defines to avoid redefinition warnings.
157 'WINVER=0x0602',
158 '_WIN32_WINNT=0x0602',
159 ],
155 'cflags!': [ '/W3', '/WX' ], 160 'cflags!': [ '/W3', '/WX' ],
156 'cflags': [ '/w' ], 161 'cflags': [ '/w' ],
157 # TODO(ldixon) : Remove this disabling of warnings by pushing a 162 # TODO(ldixon) : Remove this disabling of warnings by pushing a
158 # fix upstream to usrsctp 163 # fix upstream to usrsctp
159 'msvs_disabled_warnings': [ 4002, 4013, 4018, 4133, 4267, 4313, 4700 ] , 164 'msvs_disabled_warnings': [ 4002, 4013, 4018, 4133, 4267, 4313, 4700 ] ,
160 }, { # OS != "win", 165 }, { # OS != "win",
161 'defines': [ 166 'defines': [
162 'NON_WINDOWS_DEFINE', 167 'NON_WINDOWS_DEFINE',
163 ], 168 ],
164 }], 169 }],
165 ], # conditions 170 ], # conditions
166 }, # target usrsctp 171 }, # target usrsctp
167 ], # targets 172 ], # targets
168 } 173 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698