diff options
| author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-18 22:42:25 +0000 |
|---|---|---|
| committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-18 22:42:25 +0000 |
| commit | 52439b43509e320b602079d34cd0fd1b4f3fbde6 (patch) | |
| tree | dc2c30c6fce323a69d44889f381245380bf4cfe6 /contrib/minizip | |
| parent | 3e1c09c0496713ba251234023dabe3b0d6254216 (diff) | |
| download | zlib-52439b43509e320b602079d34cd0fd1b4f3fbde6.tar.gz | |
Use generated shim headers for zlib.
BUG=165264
Review URL: https://codereview.chromium.org/11632002
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: 056a8485be5325304fc2c28ab0cecca98e19d687
Diffstat (limited to 'contrib/minizip')
| -rw-r--r-- | contrib/minizip/ioapi.h | 4 | ||||
| -rw-r--r-- | contrib/minizip/mztools.c | 4 | ||||
| -rw-r--r-- | contrib/minizip/mztools.h | 4 | ||||
| -rw-r--r-- | contrib/minizip/unzip.c | 4 | ||||
| -rw-r--r-- | contrib/minizip/unzip.h | 4 | ||||
| -rw-r--r-- | contrib/minizip/zip.c | 4 | ||||
| -rw-r--r-- | contrib/minizip/zip.h | 4 |
7 files changed, 0 insertions, 28 deletions
diff --git a/contrib/minizip/ioapi.h b/contrib/minizip/ioapi.h index c466e97..dfa3b6c 100644 --- a/contrib/minizip/ioapi.h +++ b/contrib/minizip/ioapi.h @@ -42,11 +42,7 @@ #include <stdio.h> #include <stdlib.h> -#if defined(USE_SYSTEM_ZLIB) -#include <zlib.h> -#else #include "third_party/zlib/zlib.h" -#endif #if defined(USE_FILE32API) #define fopen64 fopen diff --git a/contrib/minizip/mztools.c b/contrib/minizip/mztools.c index d5b8859..026bf28 100644 --- a/contrib/minizip/mztools.c +++ b/contrib/minizip/mztools.c @@ -8,11 +8,7 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> -#if defined(USE_SYSTEM_ZLIB) -#include <zlib.h> -#else #include "third_party/zlib/zlib.h" -#endif #include "unzip.h" #define READ_8(adr) ((unsigned char)*(adr)) diff --git a/contrib/minizip/mztools.h b/contrib/minizip/mztools.h index 9731f19..90c834d 100644 --- a/contrib/minizip/mztools.h +++ b/contrib/minizip/mztools.h @@ -12,12 +12,8 @@ extern "C" { #endif #ifndef _ZLIB_H -#if defined(USE_SYSTEM_ZLIB) -#include <zlib.h> -#else #include "third_party/zlib/zlib.h" #endif -#endif #include "unzip.h" diff --git a/contrib/minizip/unzip.c b/contrib/minizip/unzip.c index 4289207..22481a2 100644 --- a/contrib/minizip/unzip.c +++ b/contrib/minizip/unzip.c @@ -72,11 +72,7 @@ #define NOUNCRYPT #endif -#if defined(USE_SYSTEM_ZLIB) -#include <zlib.h> -#else #include "third_party/zlib/zlib.h" -#endif #include "unzip.h" #ifdef STDC diff --git a/contrib/minizip/unzip.h b/contrib/minizip/unzip.h index b757a22..80eb36e 100644 --- a/contrib/minizip/unzip.h +++ b/contrib/minizip/unzip.h @@ -48,12 +48,8 @@ extern "C" { #endif #ifndef _ZLIB_H -#if defined(USE_SYSTEM_ZLIB) -#include <zlib.h> -#else #include "third_party/zlib/zlib.h" #endif -#endif #ifndef _ZLIBIOAPI_H #include "ioapi.h" diff --git a/contrib/minizip/zip.c b/contrib/minizip/zip.c index 04c6b25..5a82885 100644 --- a/contrib/minizip/zip.c +++ b/contrib/minizip/zip.c @@ -26,11 +26,7 @@ #include <stdlib.h> #include <string.h> #include <time.h> -#if defined(USE_SYSTEM_ZLIB) -#include <zlib.h> -#else #include "third_party/zlib/zlib.h" -#endif #include "zip.h" #ifdef STDC diff --git a/contrib/minizip/zip.h b/contrib/minizip/zip.h index 8788c02..8c06c0a 100644 --- a/contrib/minizip/zip.h +++ b/contrib/minizip/zip.h @@ -47,12 +47,8 @@ extern "C" { //#define HAVE_BZIP2 #ifndef _ZLIB_H -#if defined(USE_SYSTEM_ZLIB) -#include <zlib.h> -#else #include "third_party/zlib/zlib.h" #endif -#endif #ifndef _ZLIBIOAPI_H #include "ioapi.h" |