Avoid zlib symbol conflicts in open-vcdiff

sdch/sdch.gyp

Index: sdch/sdch.gyp
diff --git a/sdch/sdch.gyp b/sdch/sdch.gyp
index 410629f29004cfda613cc72fa646023a20d121a0..85ceb30cf75eed56db59cbab838b98051ba15e0f 100644
--- a/sdch/sdch.gyp
+++ b/sdch/sdch.gyp
@@ -10,9 +10,13 @@
     {
       'target_name': 'sdch',
       'type': 'static_library',
+      'dependencies': [
+        '../third_party/zlib/zlib.gyp:zlib',
+      ],
       'sources': [
         'open-vcdiff/src/addrcache.cc',
-        'open-vcdiff/src/adler32.c',
+        # We use third_party/zlib instead.

[Mark Mentovai, 2012/03/01 19:46:34]

1. Don’t use “we” in comments.

2. I’d group the three commented-out files together, way at the bottom of the
list.

[Xianzhu, 2012/03/01 21:28:55]

Done.

+        # 'open-vcdiff/src/adler32.c',
         'open-vcdiff/src/blockhash.cc',
         'open-vcdiff/src/blockhash.h',
         'open-vcdiff/src/checksum.h',

[Mark Mentovai, 2012/03/01 19:46:34]

This file says

#include "zlib.h"

How are you sure that it will include the zlib.h in third_party/zlib as opposed
to the one in sdch/open-vcdiff/src? I don’t think it’ll include the right one.

[Xianzhu, 2012/03/01 21:28:55]

Yes, it will include the one in sdch/open-vcdiff/src. As adler32 is the only
function needed from zlib and it's unlikely that future zlib would break binary
compatibility, do you think we can just leave the headers here? I'm trying not
to change open-vcdiff source code.

@@ -39,8 +43,9 @@
         'open-vcdiff/src/vcdiff_defs.h',
         'open-vcdiff/src/vcdiffengine.cc',
         'open-vcdiff/src/vcdiffengine.h',
-        'open-vcdiff/src/zconf.h',
-        'open-vcdiff/src/zlib.h',
+        # We use third_party/zlib instead.
+        # 'open-vcdiff/src/zconf.h',
+        # 'open-vcdiff/src/zlib.h',
         'open-vcdiff/vsprojects/config.h',
         'open-vcdiff/vsprojects/stdint.h',
       ],