cvs: php4 /ext/bcmath/ php_bcmath.h /ext/db/ php_db.h /ext/exif/ config.m4 exif.c php_exif.h /ext/ftp/ php_ftp.h /ext/gd/ php_gd.h
/ext/hyperwave/ php_hyperwave.h /ext/icap/ php_icap.h /ext/informix/ php_informix.h /ext/interbase/ php_interbase.h /ext/mcal/ php_mcal.h
/ext/msql/ php_msql.h /ext/mysql/ php_mysql.h /ext/odbc/ php_velocis.h /ext/pgsql/ php_pgsql.h /ext/posix/ php_posix.h /ext/recode/ php_recode.h
/ext/snmp/ php_snmp.h /ext/swf/ php_swf.h /ext/sybase/ php_sybase.h /ext/sybase_ct/ php_sybase_ct.h /ext/sysvsem/ php_sysvsem.h /ext/sysvshm/
php_sysvshm.h /ext/yp/ php_yp.h /ext/zlib/ php_zlib.h

andi Sat Jun 10 01:47:59 2000 EDT Modified files: /php4/ext/bcmath php_bcmath.h /php4/ext/db php_db.h /php4/ext/exif config.m4 exif.c php_exif.h /php4/ext/ftp php_ftp.h /php4/ext/gd php_gd.h /php4/ext/hyperwave php_hyperwave.h /php4/ext/icap php_icap.h /php4/ext/informix php_informix.h /php4/ext/interbase php_interbase.h /php4/ext/mcal php_mcal.h /php4/ext/msql php_msql.h /php4/ext/mysql php_mysql.h /php4/ext/odbc php_velocis.h /php4/ext/pgsql php_pgsql.h /php4/ext/posix php_posix.h /php4/ext/recode php_recode.h /php4/ext/snmp php_snmp.h /php4/ext/swf php_swf.h /php4/ext/sybase php_sybase.h /php4/ext/sybase_ct php_sybase_ct.h /php4/ext/sysvsem php_sysvsem.h /php4/ext/sysvshm php_sysvshm.h /php4/ext/yp php_yp.h /php4/ext/zlib php_zlib.h Log: - Nuke COMPILE_DL. Modules that need to be compiled as dll's in Windows - need to define both COMPILE_DL_MODULE and HAVE_MODULE=1 Index: php4/ext/bcmath/php_bcmath.h diff -u php4/ext/bcmath/php_bcmath.h:1.2 php4/ext/bcmath/php_bcmath.h:1.3 --- php4/ext/bcmath/php_bcmath.h:1.2 Fri Dec 17 12:54:46 1999 +++ php4/ext/bcmath/php_bcmath.h Sat Jun 10 01:47:56 2000 @@ -28,15 +28,10 @@ */ -/* $Id: php_bcmath.h,v 1.2 1999/12/17 20:54:46 zeev Exp $ */ +/* $Id: php_bcmath.h,v 1.3 2000/06/10 08:47:56 andi Exp $ */ #ifndef _PHP_BCMATH_H #define _PHP_BCMATH_H - -#if COMPILE_DL -#undef WITH_BCMATH -#define WITH_BCMATH 1 -#endif #if WITH_BCMATH Index: php4/ext/db/php_db.h diff -u php4/ext/db/php_db.h:1.5 php4/ext/db/php_db.h:1.6 --- php4/ext/db/php_db.h:1.5 Wed Mar 29 18:42:28 2000 +++ php4/ext/db/php_db.h Sat Jun 10 01:47:56 2000 @@ -28,7 +28,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_db.h,v 1.5 2000/03/30 02:42:28 jimjag Exp $ */ +/* $Id: php_db.h,v 1.6 2000/06/10 08:47:56 andi Exp $ */ #ifndef _PHP_DB_H @@ -57,7 +57,7 @@ because the dbm module will be external, and we do not want flatfile compiled staticly */ -#if defined(MSVC5) && !defined(COMPILE_DL) +#if defined(PHP_WIN32) && !defined(COMPILE_DL_DB) #undef phpext_db_ptr #define phpext_db_ptr NULL #endif Index: php4/ext/exif/config.m4 diff -u php4/ext/exif/config.m4:1.1 php4/ext/exif/config.m4:1.2 --- php4/ext/exif/config.m4:1.1 Wed May 24 03:33:18 2000 +++ php4/ext/exif/config.m4 Sat Jun 10 01:47:56 2000 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.1 2000/05/24 10:33:18 rasmus Exp $ +dnl $Id: config.m4,v 1.2 2000/06/10 08:47:56 andi Exp $ dnl config.m4 for extension exif PHP_ARG_ENABLE(exif, whether to enable exif support, @@ -6,6 +6,6 @@ [ --enable-exif Enable exif support]) if test "$PHP_EXIF" != "no"; then - AC_DEFINE(PHP_EXIF, 1, [Whether you want exif support]) + AC_DEFINE(HAVE_EXIF, 1, [Whether you want exif support]) PHP_EXTENSION(exif, $ext_shared) fi Index: php4/ext/exif/exif.c diff -u php4/ext/exif/exif.c:1.4 php4/ext/exif/exif.c:1.5 --- php4/ext/exif/exif.c:1.4 Mon Jun 5 12:47:40 2000 +++ php4/ext/exif/exif.c Sat Jun 10 01:47:56 2000 @@ -38,7 +38,7 @@ */ #include "php.h" -#if PHP_EXIF +#if HAVE_EXIF #include "php_exif.h" #include <math.h> Index: php4/ext/exif/php_exif.h diff -u php4/ext/exif/php_exif.h:1.2 php4/ext/exif/php_exif.h:1.3 --- php4/ext/exif/php_exif.h:1.2 Mon Jun 5 09:42:03 2000 +++ php4/ext/exif/php_exif.h Sat Jun 10 01:47:56 2000 @@ -15,12 +15,8 @@ | Authors: Rasmus Lerdorf <rasmus@php.net> | +----------------------------------------------------------------------+ */ -#ifdef COMPILE_DL || COMPILE_DL_EXIF -# undef PHP_EXIF -# define PHP_EXIF 1 -#endif -#if PHP_EXIF +#if HAVE_EXIF extern zend_module_entry exif_module_entry; #define phpext_exif_ptr &exif_module_entry Index: php4/ext/ftp/php_ftp.h diff -u php4/ext/ftp/php_ftp.h:1.9 php4/ext/ftp/php_ftp.h:1.10 --- php4/ext/ftp/php_ftp.h:1.9 Tue Feb 22 12:50:00 2000 +++ php4/ext/ftp/php_ftp.h Sat Jun 10 01:47:56 2000 @@ -28,15 +28,10 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_ftp.h,v 1.9 2000/02/22 20:50:00 askalski Exp $ */ +/* $Id: php_ftp.h,v 1.10 2000/06/10 08:47:56 andi Exp $ */ #ifndef _INCLUDED_FTP_H #define _INCLUDED_FTP_H - -#if COMPILE_DL -#undef HAVE_FTP -#define HAVE_FTP 1 -#endif #if HAVE_FTP Index: php4/ext/gd/php_gd.h diff -u php4/ext/gd/php_gd.h:1.10 php4/ext/gd/php_gd.h:1.11 --- php4/ext/gd/php_gd.h:1.10 Wed Jun 7 16:04:39 2000 +++ php4/ext/gd/php_gd.h Sat Jun 10 01:47:56 2000 @@ -29,7 +29,7 @@ */ -/* $Id: php_gd.h,v 1.10 2000/06/07 23:04:39 jah Exp $ */ +/* $Id: php_gd.h,v 1.11 2000/06/10 08:47:56 andi Exp $ */ #ifndef _PHP_GD_H #define _PHP_GD_H @@ -38,11 +38,6 @@ #if HAVE_LIBTTF|HAVE_LIBFREETYPE #define ENABLE_GD_TTF -#endif - -#if COMPILE_DL -#undef HAVE_LIBGD -#define HAVE_LIBGD 1 #endif #if HAVE_LIBGD Index: php4/ext/hyperwave/php_hyperwave.h diff -u php4/ext/hyperwave/php_hyperwave.h:1.4 php4/ext/hyperwave/php_hyperwave.h:1.5 --- php4/ext/hyperwave/php_hyperwave.h:1.4 Sat Feb 12 06:38:01 2000 +++ php4/ext/hyperwave/php_hyperwave.h Sat Jun 10 01:47:56 2000 @@ -23,15 +23,10 @@ */ -/* $Id: php_hyperwave.h,v 1.4 2000/02/12 14:38:01 sas Exp $ */ +/* $Id: php_hyperwave.h,v 1.5 2000/06/10 08:47:56 andi Exp $ */ #ifndef _HW_H #define _HW_H - -#if COMPILE_DL -#undef HYPERWAVE -#define HYPERWAVE 1 -#endif #ifdef PHP_WIN32 #define PHP_HW_API __declspec(dllexport) Index: php4/ext/icap/php_icap.h diff -u php4/ext/icap/php_icap.h:1.3 php4/ext/icap/php_icap.h:1.4 --- php4/ext/icap/php_icap.h:1.3 Fri Dec 17 14:01:09 1999 +++ php4/ext/icap/php_icap.h Sat Jun 10 01:47:56 2000 @@ -1,19 +1,11 @@ -/* $Id: php_icap.h,v 1.3 1999/12/17 22:01:09 zeev Exp $ */ +/* $Id: php_icap.h,v 1.4 2000/06/10 08:47:56 andi Exp $ */ #ifndef _INCLUDED_ICAP_H #define _INCLUDED_ICAP_H -#if COMPILE_DL -#undef HAVE_ICAP -#define HAVE_ICAP 1 -#endif - #if HAVE_ICAP -#ifdef THREAD_SAFE -#include "tls.h" -#endif -#ifndef MSVC5 +#ifndef PHP_WIN32 #include "build-defs.h" #endif @@ -48,7 +40,3 @@ #endif - - - - Index: php4/ext/informix/php_informix.h diff -u php4/ext/informix/php_informix.h:1.8 php4/ext/informix/php_informix.h:1.9 --- php4/ext/informix/php_informix.h:1.8 Fri Feb 25 19:20:50 2000 +++ php4/ext/informix/php_informix.h Sat Jun 10 01:47:57 2000 @@ -34,12 +34,6 @@ #ifndef _PHP_IFX_H #define _PHP_IFX_H - -#if COMPILE_DL -#undef HAVE_IFX -#define HAVE_IFX 1 -#endif - #ifdef PHP_WIN32 #define PHP_IFX_API __declspec(dllexport) #else Index: php4/ext/interbase/php_interbase.h diff -u php4/ext/interbase/php_interbase.h:1.11 php4/ext/interbase/php_interbase.h:1.12 --- php4/ext/interbase/php_interbase.h:1.11 Thu May 18 08:34:27 2000 +++ php4/ext/interbase/php_interbase.h Sat Jun 10 01:47:57 2000 @@ -17,15 +17,10 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_interbase.h,v 1.11 2000/05/18 15:34:27 zeev Exp $ */ +/* $Id: php_interbase.h,v 1.12 2000/06/10 08:47:57 andi Exp $ */ #ifndef _PHP_IBASE_H #define _PHP_IBASE_H - -#if COMPILE_DL -#undef HAVE_IBASE -#define HAVE_IBASE 1 -#endif #if HAVE_IBASE #include <ibase.h> Index: php4/ext/mcal/php_mcal.h diff -u php4/ext/mcal/php_mcal.h:1.6 php4/ext/mcal/php_mcal.h:1.7 --- php4/ext/mcal/php_mcal.h:1.6 Fri Mar 10 18:15:13 2000 +++ php4/ext/mcal/php_mcal.h Sat Jun 10 01:47:57 2000 @@ -1,19 +1,11 @@ -/* $Id: php_mcal.h,v 1.6 2000/03/11 02:15:13 chagenbu Exp $ */ +/* $Id: php_mcal.h,v 1.7 2000/06/10 08:47:57 andi Exp $ */ #ifndef _INCLUDED_MCAL_H #define _INCLUDED_MCAL_H -#if COMPILE_DL -#undef HAVE_MCAL -#define HAVE_MCAL 1 -#endif - #if HAVE_MCAL -#ifdef THREAD_SAFE -#include "tls.h" -#endif -#ifndef MSVC5 +#ifndef PHP_WIN32 #include "build-defs.h" #endif @@ -84,7 +76,3 @@ #endif - - - - Index: php4/ext/msql/php_msql.h diff -u php4/ext/msql/php_msql.h:1.2 php4/ext/msql/php_msql.h:1.3 --- php4/ext/msql/php_msql.h:1.2 Sat Sep 4 04:05:33 1999 +++ php4/ext/msql/php_msql.h Sat Jun 10 01:47:57 2000 @@ -28,15 +28,10 @@ */ -/* $Id: php_msql.h,v 1.2 1999/09/04 11:05:33 zeev Exp $ */ +/* $Id: php_msql.h,v 1.3 2000/06/10 08:47:57 andi Exp $ */ #ifndef _PHP_MSQL_H #define _PHP_MSQL_H - -#if COMPILE_DL -#undef HAVE_MSQL -#define HAVE_MSQL 1 -#endif #if HAVE_MSQL Index: php4/ext/mysql/php_mysql.h diff -u php4/ext/mysql/php_mysql.h:1.10 php4/ext/mysql/php_mysql.h:1.11 --- php4/ext/mysql/php_mysql.h:1.10 Thu May 18 08:34:30 2000 +++ php4/ext/mysql/php_mysql.h Sat Jun 10 01:47:57 2000 @@ -17,16 +17,11 @@ */ -/* $Id: php_mysql.h,v 1.10 2000/05/18 15:34:30 zeev Exp $ */ +/* $Id: php_mysql.h,v 1.11 2000/06/10 08:47:57 andi Exp $ */ #ifndef _PHP_MYSQL_H #define _PHP_MYSQL_H -#ifdef COMPILE_DL -# undef HAVE_MYSQL -# define HAVE_MYSQL 1 -#endif - #ifdef PHP_WIN32 #define PHP_MYSQL_API __declspec(dllexport) #else @@ -35,7 +30,7 @@ #if HAVE_MYSQL -#ifdef __ZTS +#ifdef ZTS #include "TSRM.h" #endif Index: php4/ext/odbc/php_velocis.h diff -u php4/ext/odbc/php_velocis.h:1.3 php4/ext/odbc/php_velocis.h:1.4 --- php4/ext/odbc/php_velocis.h:1.3 Fri Dec 17 14:27:25 1999 +++ php4/ext/odbc/php_velocis.h Sat Jun 10 01:47:57 2000 @@ -28,15 +28,10 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_velocis.h,v 1.3 1999/12/17 22:27:25 zeev Exp $ */ +/* $Id: php_velocis.h,v 1.4 2000/06/10 08:47:57 andi Exp $ */ #ifndef _PHP_VELOCIS_H #define _PHP_VELOCIS_H - -#if COMPILE_DL -#undef HAVE_VELOCIS -#define HAVE_VELOCIS 1 -#endif #if defined(HAVE_VELOCIS) && !HAVE_UODBC #define UNIX Index: php4/ext/pgsql/php_pgsql.h diff -u php4/ext/pgsql/php_pgsql.h:1.14 php4/ext/pgsql/php_pgsql.h:1.15 --- php4/ext/pgsql/php_pgsql.h:1.14 Fri Jun 9 15:39:56 2000 +++ php4/ext/pgsql/php_pgsql.h Sat Jun 10 01:47:57 2000 @@ -17,15 +17,10 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_pgsql.h,v 1.14 2000/06/09 22:39:56 andi Exp $ */ +/* $Id: php_pgsql.h,v 1.15 2000/06/10 08:47:57 andi Exp $ */ #ifndef _PHP_PGSQL_H #define _PHP_PGSQL_H - -#ifdef COMPILE_DL_PGSQL -#undef HAVE_PGSQL -#define HAVE_PGSQL 1 -#endif #if HAVE_PGSQL Index: php4/ext/posix/php_posix.h diff -u php4/ext/posix/php_posix.h:1.2 php4/ext/posix/php_posix.h:1.3 --- php4/ext/posix/php_posix.h:1.2 Fri Dec 17 12:55:19 1999 +++ php4/ext/posix/php_posix.h Sat Jun 10 01:47:57 2000 @@ -28,16 +28,12 @@ */ -/* $Id: php_posix.h,v 1.2 1999/12/17 20:55:19 zeev Exp $ */ +/* $Id: php_posix.h,v 1.3 2000/06/10 08:47:57 andi Exp $ */ #ifndef _PHP_POSIX_H #define _PHP_POSIX_H -#if COMPILE_DL -#define HAVE_POSIX 1 -#endif -#if HAVE_POSIX #ifndef DLEXPORT #define DLEXPORT #endif Index: php4/ext/recode/php_recode.h diff -u php4/ext/recode/php_recode.h:1.3 php4/ext/recode/php_recode.h:1.4 --- php4/ext/recode/php_recode.h:1.3 Tue Jun 6 07:13:35 2000 +++ php4/ext/recode/php_recode.h Sat Jun 10 01:47:58 2000 @@ -17,15 +17,10 @@ */ -/* $Id: php_recode.h,v 1.3 2000/06/06 14:13:35 thies Exp $ */ +/* $Id: php_recode.h,v 1.4 2000/06/10 08:47:58 andi Exp $ */ #ifndef _PHP_RECODE_H #define _PHP_RECODE_H - -#ifdef COMPILE_DL_RECODE -#undef HAVE_LIBRECODE -#define HAVE_LIBRECODE 1 -#endif #ifdef PHP_WIN32 #define PHP_MYSQL_API __declspec(dllexport) Index: php4/ext/snmp/php_snmp.h diff -u php4/ext/snmp/php_snmp.h:1.7 php4/ext/snmp/php_snmp.h:1.8 --- php4/ext/snmp/php_snmp.h:1.7 Thu May 18 08:34:34 2000 +++ php4/ext/snmp/php_snmp.h Sat Jun 10 01:47:58 2000 @@ -18,14 +18,10 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_snmp.h,v 1.7 2000/05/18 15:34:34 zeev Exp $ */ +/* $Id: php_snmp.h,v 1.8 2000/06/10 08:47:58 andi Exp $ */ #ifndef _PHP_SNMP_H #define _PHP_SNMP_H -#if COMPILE_DL -#undef HAVE_SNMP -#define HAVE_SNMP 1 -#endif #if HAVE_SNMP #ifndef DLEXPORT #define DLEXPORT Index: php4/ext/swf/php_swf.h diff -u php4/ext/swf/php_swf.h:1.6 php4/ext/swf/php_swf.h:1.7 --- php4/ext/swf/php_swf.h:1.6 Mon May 22 21:09:20 2000 +++ php4/ext/swf/php_swf.h Sat Jun 10 01:47:58 2000 @@ -16,15 +16,10 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_swf.h,v 1.6 2000/05/23 04:09:20 sterling Exp $ */ +/* $Id: php_swf.h,v 1.7 2000/06/10 08:47:58 andi Exp $ */ #ifndef _PHP_SWF_H #define _PHP_SWF_H - -#ifdef COMPILE_DL_SWF -#undef HAVE_SWF -#define HAVE_SWF 1 -#endif #if HAVE_SWF Index: php4/ext/sybase/php_sybase.h diff -u php4/ext/sybase/php_sybase.h:1.3 php4/ext/sybase/php_sybase.h:1.4 --- php4/ext/sybase/php_sybase.h:1.3 Fri Dec 17 19:20:50 1999 +++ php4/ext/sybase/php_sybase.h Sat Jun 10 01:47:58 2000 @@ -28,15 +28,10 @@ */ -/* $Id: php_sybase.h,v 1.3 1999/12/18 03:20:50 zeev Exp $ */ +/* $Id: php_sybase.h,v 1.4 2000/06/10 08:47:58 andi Exp $ */ #ifndef _PHP_SYBASE_H #define _PHP_SYBASE_H - -#if COMPILE_DL -#undef HAVE_SYBASE -#define HAVE_SYBASE 1 -#endif #if HAVE_SYBASE Index: php4/ext/sybase_ct/php_sybase_ct.h diff -u php4/ext/sybase_ct/php_sybase_ct.h:1.3 php4/ext/sybase_ct/php_sybase_ct.h:1.4 --- php4/ext/sybase_ct/php_sybase_ct.h:1.3 Fri Feb 25 19:20:55 2000 +++ php4/ext/sybase_ct/php_sybase_ct.h Sat Jun 10 01:47:58 2000 @@ -28,15 +28,10 @@ */ -/* $Id: php_sybase_ct.h,v 1.3 2000/02/26 03:20:55 zeev Exp $ */ +/* $Id: php_sybase_ct.h,v 1.4 2000/06/10 08:47:58 andi Exp $ */ #ifndef _PHP_SYBASE_CT_H #define _PHP_SYBASE_CT_H - -#if COMPILE_DL -#undef HAVE_SYBASE_CT -#define HAVE_SYBASE_CT 1 -#endif #if HAVE_SYBASE_CT Index: php4/ext/sysvsem/php_sysvsem.h diff -u php4/ext/sysvsem/php_sysvsem.h:1.4 php4/ext/sysvsem/php_sysvsem.h:1.5 --- php4/ext/sysvsem/php_sysvsem.h:1.4 Sat Dec 18 07:10:04 1999 +++ php4/ext/sysvsem/php_sysvsem.h Sat Jun 10 01:47:58 2000 @@ -28,15 +28,10 @@ */ -/* $Id: php_sysvsem.h,v 1.4 1999/12/18 15:10:04 thies Exp $ */ +/* $Id: php_sysvsem.h,v 1.5 2000/06/10 08:47:58 andi Exp $ */ #ifndef _PHP_SYSVSEM_H #define _PHP_SYSVSEM_H - -#if COMPILE_DL -#undef HAVE_SYSVSEM -#define HAVE_SYSVSEM 1 -#endif #if HAVE_SYSVSEM Index: php4/ext/sysvshm/php_sysvshm.h diff -u php4/ext/sysvshm/php_sysvshm.h:1.3 php4/ext/sysvshm/php_sysvshm.h:1.4 --- php4/ext/sysvshm/php_sysvshm.h:1.3 Fri Dec 17 20:01:18 1999 +++ php4/ext/sysvshm/php_sysvshm.h Sat Jun 10 01:47:58 2000 @@ -28,16 +28,10 @@ */ -/* $Id: php_sysvshm.h,v 1.3 1999/12/18 04:01:18 zeev Exp $ */ +/* $Id: php_sysvshm.h,v 1.4 2000/06/10 08:47:58 andi Exp $ */ #ifndef _PHP_SYSVSHM_H #define _PHP_SYSVSHM_H - -#if COMPILE_DL -#undef HAVE_SYSVSHM -#define HAVE_SYSVSHM 1 -#endif - #if HAVE_SYSVSHM Index: php4/ext/yp/php_yp.h diff -u php4/ext/yp/php_yp.h:1.4 php4/ext/yp/php_yp.h:1.5 --- php4/ext/yp/php_yp.h:1.4 Fri Dec 17 19:20:53 1999 +++ php4/ext/yp/php_yp.h Sat Jun 10 01:47:58 2000 @@ -26,15 +26,10 @@ | Authors: Stephanie Wehner <_@r4k.net> | +----------------------------------------------------------------------+ */ -/* $Id: php_yp.h,v 1.4 1999/12/18 03:20:53 zeev Exp $ */ +/* $Id: php_yp.h,v 1.5 2000/06/10 08:47:58 andi Exp $ */ #ifndef _PHP_YP_H #define _PHP_YP_H - -#if COMPILE_DL -#undef HAVE_YP -#define HAVE_YP 1 -#endif #if HAVE_YP Index: php4/ext/zlib/php_zlib.h diff -u php4/ext/zlib/php_zlib.h:1.5 php4/ext/zlib/php_zlib.h:1.6 --- php4/ext/zlib/php_zlib.h:1.5 Thu May 25 09:35:49 2000 +++ php4/ext/zlib/php_zlib.h Sat Jun 10 01:47:58 2000 @@ -23,15 +23,10 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_zlib.h,v 1.5 2000/05/25 16:35:49 hholzgra Exp $ */ +/* $Id: php_zlib.h,v 1.6 2000/06/10 08:47:58 andi Exp $ */ #ifndef _PHP_ZLIB_H #define _PHP_ZLIB_H - -#if COMPILE_DL_ZLIB -#undef HAVE_ZLIB -#define HAVE_ZLIB 1 -#endif #if HAVE_ZLIB