- Nuke COMPILE_DL. Modules that need to be compiled as dll's in Windows

Andi Gutmans · Andi Gutmans · commit a9d4cf90237f · 2000-06-10T08:48:01.000Z
- need to define both COMPILE_DL_MODULE and HAVE_MODULE=1
diff --git a/ext/bcmath/php_bcmath.h b/ext/bcmath/php_bcmath.h
@@ -33,11 +33,6 @@
 #ifndef _PHP_BCMATH_H
 #define _PHP_BCMATH_H
 
-#if COMPILE_DL
-#undef WITH_BCMATH
-#define WITH_BCMATH 1
-#endif
-
 #if WITH_BCMATH
 
 extern zend_module_entry bcmath_module_entry;
diff --git a/ext/db/php_db.h b/ext/db/php_db.h
@@ -57,7 +57,7 @@ typedef struct dbm_info {
   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
diff --git a/ext/exif/config.m4 b/ext/exif/config.m4
@@ -6,6 +6,6 @@ dnl Make sure that the comment is aligned:
 [  --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
diff --git a/ext/exif/exif.c b/ext/exif/exif.c
@@ -38,7 +38,7 @@
   */
 #include "php.h"
 
-#if PHP_EXIF
+#if HAVE_EXIF
 
 #include "php_exif.h"
 #include <math.h>
diff --git a/ext/exif/php_exif.h b/ext/exif/php_exif.h
@@ -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
 
diff --git a/ext/ftp/php_ftp.h b/ext/ftp/php_ftp.h
@@ -33,11 +33,6 @@
 #ifndef	_INCLUDED_FTP_H
 #define	_INCLUDED_FTP_H
 
-#if COMPILE_DL
-#undef HAVE_FTP
-#define HAVE_FTP 1
-#endif
-
 #if HAVE_FTP
 
 extern zend_module_entry php_ftp_module_entry;
diff --git a/ext/gd/php_gd.h b/ext/gd/php_gd.h
@@ -40,11 +40,6 @@
 #define ENABLE_GD_TTF
 #endif
 
-#if COMPILE_DL
-#undef HAVE_LIBGD
-#define HAVE_LIBGD 1
-#endif
-
 #if HAVE_LIBGD
 
 #include <gd.h>
diff --git a/ext/hyperwave/php_hyperwave.h b/ext/hyperwave/php_hyperwave.h
@@ -28,11 +28,6 @@
 #ifndef _HW_H
 #define _HW_H
 
-#if COMPILE_DL
-#undef HYPERWAVE
-#define HYPERWAVE 1
-#endif
-
 #ifdef PHP_WIN32
 #define PHP_HW_API __declspec(dllexport)
 #else
diff --git a/ext/icap/php_icap.h b/ext/icap/php_icap.h
@@ -3,17 +3,9 @@
 #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 @@ PHP_FUNCTION(icap_list_alarms);
 
 
 #endif
-
-
-
-
diff --git a/ext/informix/php_informix.h b/ext/informix/php_informix.h
@@ -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
diff --git a/ext/interbase/php_interbase.h b/ext/interbase/php_interbase.h
@@ -22,11 +22,6 @@
 #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>
 
diff --git a/ext/mcal/php_mcal.h b/ext/mcal/php_mcal.h
@@ -3,17 +3,9 @@
 #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 @@ PHP_FUNCTION(mcal_fetch_current_stream_event);
 
 
 #endif
-
-
-
-
diff --git a/ext/msql/php_msql.h b/ext/msql/php_msql.h
@@ -33,11 +33,6 @@
 #ifndef _PHP_MSQL_H
 #define _PHP_MSQL_H
 
-#if COMPILE_DL
-#undef HAVE_MSQL
-#define HAVE_MSQL 1
-#endif
-
 #if HAVE_MSQL
 
 extern zend_module_entry msql_module_entry;
diff --git a/ext/mysql/php_mysql.h b/ext/mysql/php_mysql.h
@@ -22,11 +22,6 @@
 #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
 
diff --git a/ext/odbc/php_velocis.h b/ext/odbc/php_velocis.h
@@ -33,11 +33,6 @@
 #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
 #include <sql.h>
diff --git a/ext/pgsql/php_pgsql.h b/ext/pgsql/php_pgsql.h
@@ -22,11 +22,6 @@
 #ifndef _PHP_PGSQL_H
 #define _PHP_PGSQL_H
 
-#ifdef COMPILE_DL_PGSQL
-#undef HAVE_PGSQL
-#define HAVE_PGSQL 1
-#endif
-
 #if HAVE_PGSQL
 
 extern zend_module_entry pgsql_module_entry;
diff --git a/ext/posix/php_posix.h b/ext/posix/php_posix.h
@@ -33,11 +33,7 @@
 #ifndef _PHP_POSIX_H
 #define _PHP_POSIX_H
 
-#if COMPILE_DL
-#define HAVE_POSIX 1
-#endif
 
-#if HAVE_POSIX
 #ifndef DLEXPORT
 #define DLEXPORT
 #endif
diff --git a/ext/recode/php_recode.h b/ext/recode/php_recode.h
@@ -22,11 +22,6 @@
 #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)
 #else
diff --git a/ext/snmp/php_snmp.h b/ext/snmp/php_snmp.h
@@ -22,10 +22,6 @@
 #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
diff --git a/ext/swf/php_swf.h b/ext/swf/php_swf.h
@@ -21,11 +21,6 @@
 #ifndef _PHP_SWF_H
 #define _PHP_SWF_H
 
-#ifdef COMPILE_DL_SWF
-#undef HAVE_SWF
-#define HAVE_SWF 1
-#endif
-
 #if HAVE_SWF
 
 extern zend_module_entry swf_module_entry;
diff --git a/ext/sybase/php_sybase.h b/ext/sybase/php_sybase.h
@@ -33,11 +33,6 @@
 #ifndef _PHP_SYBASE_H
 #define _PHP_SYBASE_H
 
-#if COMPILE_DL
-#undef HAVE_SYBASE
-#define HAVE_SYBASE 1
-#endif
-
 #if HAVE_SYBASE
 
 extern zend_module_entry sybase_module_entry;
diff --git a/ext/sybase_ct/php_sybase_ct.h b/ext/sybase_ct/php_sybase_ct.h
@@ -33,11 +33,6 @@
 #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
 
 #define CTLIB_VERSION CS_VERSION_100
diff --git a/ext/sysvsem/php_sysvsem.h b/ext/sysvsem/php_sysvsem.h
@@ -33,11 +33,6 @@
 #ifndef _PHP_SYSVSEM_H
 #define _PHP_SYSVSEM_H
 
-#if COMPILE_DL
-#undef HAVE_SYSVSEM
-#define HAVE_SYSVSEM 1
-#endif
-
 #if HAVE_SYSVSEM
 
 extern zend_module_entry sysvsem_module_entry;
diff --git a/ext/sysvshm/php_sysvshm.h b/ext/sysvshm/php_sysvshm.h
@@ -33,12 +33,6 @@
 #ifndef _PHP_SYSVSHM_H
 #define _PHP_SYSVSHM_H
 
-#if COMPILE_DL
-#undef HAVE_SYSVSHM
-#define HAVE_SYSVSHM 1
-#endif
-
-
 #if HAVE_SYSVSHM
 
 extern zend_module_entry sysvshm_module_entry;
diff --git a/ext/yp/php_yp.h b/ext/yp/php_yp.h
@@ -31,11 +31,6 @@
 #ifndef _PHP_YP_H
 #define _PHP_YP_H
 
-#if COMPILE_DL
-#undef HAVE_YP
-#define HAVE_YP 1
-#endif
-
 #if HAVE_YP
 
 extern zend_module_entry yp_module_entry;
diff --git a/ext/zlib/php_zlib.h b/ext/zlib/php_zlib.h
@@ -28,11 +28,6 @@
 #ifndef _PHP_ZLIB_H
 #define _PHP_ZLIB_H
 
-#if COMPILE_DL_ZLIB
-#undef HAVE_ZLIB
-#define HAVE_ZLIB 1
-#endif
-
 #if HAVE_ZLIB
 
 typedef struct {
