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

Unified Diff: sdch/sdch.gyp

Issue 9555002: Avoid zlib symbol conflicts in open-vcdiff (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Fix tab char Created 8 years, 10 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sdch/sdch.gyp
diff --git a/sdch/sdch.gyp b/sdch/sdch.gyp
index 410629f29004cfda613cc72fa646023a20d121a0..bb62bce8e3bf069d74af2cab5c3b255bef93ceb9 100644
--- a/sdch/sdch.gyp
+++ b/sdch/sdch.gyp
@@ -47,6 +47,11 @@
'include_dirs': [
'open-vcdiff/src',
],
+ 'defines': [
+ # Prefix the local zlib function names (e.g. adler32 -> z_adler32) to
+ # avoid link warning due to name conflict with zlib.
+ 'Z_PREFIX',
tonyg 2012/03/01 11:32:54 Sorry for the naive question, but why is there a l
Xianzhu 2012/03/01 17:44:44 Good question. I just compared sdch/open-vcdiff/sr
+ ],
'direct_dependent_settings': {
'include_dirs': [
'open-vcdiff/src',
« 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