Skip to content

Commit

Permalink
Don't include node shipped version "zlib.h".
Browse files Browse the repository at this point in the history
Make 'deps/zlib' include its version "zlib.h" header file to avoid
conficts with node's zlib.
  • Loading branch information
hokein committed Oct 31, 2015
1 parent a738800 commit 036bdeb
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion deps/zlib/contrib/minizip/unzip.c
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ woven in by Terry Thorsen 1/2003.
#if defined(USE_SYSTEM_ZLIB)
#include <zlib.h>
#else
#include "zlib.h"
#include "../../zlib.h"
#endif
#include "unzip.h"

Expand Down
2 changes: 1 addition & 1 deletion deps/zlib/contrib/minizip/unzip.h
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ extern "C" {
#if defined(USE_SYSTEM_ZLIB)
#include <zlib.h>
#else
#include "zlib.h"
#include "../../zlib.h"
#endif

#ifndef _ZLIBIOAPI_H
Expand Down
2 changes: 1 addition & 1 deletion deps/zlib/contrib/minizip/zip.c
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
#if defined(USE_SYSTEM_ZLIB)
#include <zlib.h>
#else
#include "zlib.h"
#include "../../zlib.h"
#endif
#include "zip.h"

Expand Down
2 changes: 1 addition & 1 deletion deps/zlib/contrib/minizip/zip.h
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ extern "C" {
#if defined(USE_SYSTEM_ZLIB)
#include <zlib.h>
#else
#include "zlib.h"
#include "../../zlib.h"
#endif

#ifndef _ZLIBIOAPI_H
Expand Down

0 comments on commit 036bdeb

Please sign in to comment.