[opendemo-cvs] CVS: opendemo/src/rtcw-mp/opendemo/opendemo od_filebuf.h,1.2,1.3

[Uwe G. <gi...@us...>]

Update of /cvsroot/opendemo/opendemo/src/rtcw-mp/opendemo/opendemo
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18878/rtcw-mp/opendemo/opendemo

Modified Files:
	od_filebuf.h 
Log Message:
Allow to completely disable usage of zlib routines at compile time.
The zlib files will still be compiled though.


Index: od_filebuf.h
===================================================================
RCS file: /cvsroot/opendemo/opendemo/src/rtcw-mp/opendemo/opendemo/od_filebuf.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** od_filebuf.h	28 Feb 2004 20:27:17 -0000	1.2
--- od_filebuf.h	17 Apr 2004 18:15:38 -0000	1.3
***************
*** 25,29 ****
  #include "od_membuf.h"
  #include "od_private.h"		/* for od */
- #include "zlib/zlib.h"
  
  #ifdef __cplusplus
--- 25,28 ----
***************
*** 32,35 ****
--- 31,35 ----
  
  
+ /* Set HAVE_ZLIB to 0, if you don't want to compile with it. */
  #define HAVE_ZLIB 1
  
***************
*** 39,42 ****
--- 39,43 ----
   */
  #if HAVE_ZLIB
+ #include "zlib/zlib.h"
  #define gen_eof(x) ((od.cv.od_zlib.integer) ? (gzeof(x)) : (odfeof(x)))
  #ifdef RETURN_HACK
***************
*** 56,60 ****
--- 57,65 ----
  
  typedef struct {
+ #if HAVE_ZLIB
  	gzFile       fp;   /* input file stream, may be compressed or uncompressed */
+ #else
+ 	odFILE       *fp;  /* OD self made input stream */
+ #endif
  	mb_t*        mb;   /* buffer used to allow peeking */
  	size_t       tail; /* fbRead*() starts reading data at buffer + tail */