diff options
| author | fdegans <fdegans@chromium.org> | 2015-07-17 11:01:27 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-07-17 18:02:08 +0000 |
| commit | f4e4593648c4ec94abdbd02c749716ced69b8cbc (patch) | |
| tree | 1feac870ebac4fc0741f088f0a1b5d40e1cdb824 /sdch/sdch.gyp | |
| parent | ee17e93a2684e2420ab932432edce920b3355a8e (diff) | |
| download | chromium_src-f4e4593648c4ec94abdbd02c749716ced69b8cbc.zip chromium_src-f4e4593648c4ec94abdbd02c749716ced69b8cbc.tar.gz chromium_src-f4e4593648c4ec94abdbd02c749716ced69b8cbc.tar.bz2 | |
[open-vcdiff] Change upstream repository to github.
This also changes all the references to http://code.google.com/p/open-vcdiff
to point to https://github.com/google/open-vcdiff
BUG=510860
Review URL: https://codereview.chromium.org/1242533003
Cr-Commit-Position: refs/heads/master@{#339282}
Diffstat (limited to 'sdch/sdch.gyp')
| -rw-r--r-- | sdch/sdch.gyp | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/sdch/sdch.gyp b/sdch/sdch.gyp index e886288..a184c88 100644 --- a/sdch/sdch.gyp +++ b/sdch/sdch.gyp @@ -60,22 +60,20 @@ [ 'OS == "linux" or OS == "android"', { 'include_dirs': [ 'linux' ] } ], [ 'os_bsd==1 or OS=="solaris"', { 'include_dirs': [ 'bsd' ] } ], [ 'OS == "ios"', { 'include_dirs': [ 'ios' ] } ], - [ 'OS == "mac"', { 'include_dirs': [ 'mac' ] } ], + [ 'OS == "mac"', { + 'include_dirs': [ 'mac' ], + 'defines': [ 'OPEN_VCDIFF_USE_AUTO_PTR' ], + }], [ 'OS == "win"', { 'include_dirs': [ 'win' ] } ], ], # open-vcdiff's logging.h introduces static initializers. This was # reported upstream years ago ( - # https://code.google.com/p/open-vcdiff/issues/detail?id=33 ). Since + # https://github.com/google/open-vcdiff/issues/33 ). Since # upstream won't fix this, work around it on the chromium side: # Inject a header that forwards to base/logging.h instead (which doesn't # introduce static initializers, and which prevents open-vcdiff's # logging.h from being used). 'variables': { - 'clang_warning_flags': [ - # sdch uses the pre-c++11 typedef-as-static_assert hack. - # https://code.google.com/p/open-vcdiff/issues/detail?id=44 - '-Wno-unused-local-typedef', - ], 'logging_path': 'logging_forward.h', 'conditions': [ # gyp leaves unspecified what the cwd is when running the compiler, |