diff options
| author | hbono@chromium.org <hbono@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-13 08:39:06 +0000 |
|---|---|---|
| committer | hbono@chromium.org <hbono@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-13 08:39:06 +0000 |
| commit | cb92c20f09b8b765b555ce16f73314e64059ddec (patch) | |
| tree | 936f0a7bacaf8b687059cb136df9dda6f17955f7 /zconf.h | |
| parent | d2dc209379ece2d8f4a4c05a6e84572109ab771d (diff) | |
| download | zlib-cb92c20f09b8b765b555ce16f73314e64059ddec.tar.gz | |
Include "mozzconf.h".
This change includes "mozzconf.h" in our copy of 'zconf.h' as we did before updating to zlib 1.2.5 to avoid symbol conflicts with sdch happening when we use supalink.
BUG=none
TEST=link Chromium with supalink.
Review URL: http://codereview.chromium.org/8933001
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: c4a36798706f2143fc1717ebb13bccb8b552285f
Diffstat (limited to 'zconf.h')
| -rw-r--r-- | zconf.h | 3 |
1 files changed, 3 insertions, 0 deletions
@@ -8,6 +8,9 @@ #ifndef ZCONF_H #define ZCONF_H +/* This include does prefixing as below, but with an updated set of names */ +#include "mozzconf.h" + /* * If you *really* need a unique prefix for all types and library functions, * compile with -DZ_PREFIX. The "standard" zlib should be compiled without it. |