[quake3-commits] r1702 - in trunk: . code/qcommon

[DONOTREPLY at icculus.org]

Author: ludwig
Date: 2009-10-24 10:19:39 -0400 (Sat, 24 Oct 2009)
New Revision: 1702

Modified:
   trunk/Makefile
   trunk/code/qcommon/unzip.c
   trunk/code/qcommon/unzip.h
Log:
fix zlib includes

Modified: trunk/Makefile
===================================================================
--- trunk/Makefile	2009-10-24 12:01:29 UTC (rev 1701)
+++ trunk/Makefile	2009-10-24 14:19:39 UTC (rev 1702)
@@ -879,6 +879,9 @@
 
 ifeq ($(USE_INTERNAL_ZLIB),1)
   BASE_CFLAGS += -DNO_GZIP
+  ifneq ($(USE_LOCAL_HEADERS),1)
+    BASE_CFLAGS += -I$(ZDIR)
+  endif
 else
   LIBS += -lz
 endif

Modified: trunk/code/qcommon/unzip.c
===================================================================
--- trunk/code/qcommon/unzip.c	2009-10-24 12:01:29 UTC (rev 1701)
+++ trunk/code/qcommon/unzip.c	2009-10-24 14:19:39 UTC (rev 1702)
@@ -38,7 +38,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "zlib.h"
 #include "unzip.h"
 
 #ifdef STDC

Modified: trunk/code/qcommon/unzip.h
===================================================================
--- trunk/code/qcommon/unzip.h	2009-10-24 12:01:29 UTC (rev 1701)
+++ trunk/code/qcommon/unzip.h	2009-10-24 14:19:39 UTC (rev 1702)
@@ -49,17 +49,12 @@
 extern "C" {
 #endif
 
-#ifndef _ZLIB_H
-  #ifdef USE_LOCAL_HEADERS
-    #include "../zlib/zlib.h"
-  #else
-    #include <zlib.h>
-  #endif
+#ifdef USE_LOCAL_HEADERS
+  #include "../zlib/zlib.h"
+#else
+  #include <zlib.h>
 #endif
-
-#ifndef _ZLIBIOAPI_H
 #include "ioapi.h"
-#endif
 
 #define NOUNCRYPT