- 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

diff --git a/ext/bcmath/php_bcmath.h b/ext/bcmath/php_bcmath.h
index f9be3f53b151df793338c19cfb5a0d594b0b7324..1a506481eac9e1a15da1840df69b3a17d3cd8140 100644 (file)
--- 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
index 61b45471ec1012a397cef62d519f2827e86fe417..d65a94e04d7001457a6c85df815dcf0498a239e2 100644 (file)
--- 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
index 4ef1138f1baca2145a67b4fd7a2a68606ce91886..53dabb6bd8dafcaccc041c29eed3ca10e1a34a98 100644 (file)
--- 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
index 5c52c194e6c5149b8ac2abea9e99f9db24d55c2b..d11cd385974ad1ba46419fbac656a3838d19e1b7 100644 (file)
--- 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
index 2f0bcff864a49abf22853066ebee9e8d88ed2cf2..fe3699c01541255708ab387cfe2f0e20fe5f5a2f 100644 (file)
--- 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
index 08bece1b30e6d80f6d30b3e03b82e8a69782d47e..e602fe79fc49f596417e9cdcd7313a331acc9456 100644 (file)
--- 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
index c8c49e9ee6f980819d8cbc7b2ca5c8e7db7906f2..56847879b20554e8d5745a274ec2f63bfa72c757 100644 (file)
--- 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
index dcde3aeedb90fc0335b329be990cfe2a94d1df38..067162bd83b154dd0a916765ed454b4cfd16649f 100644 (file)
--- 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
index 91ceacd2c769f126512490e0e45bd94e4f8f68ff..266b297f1729db58b6267258e2de0e46abc3dd8e 100644 (file)
--- 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
index d5595ce2c96dbff64590b7e3d22895202da20590..6814deed73d3fb35887cd418cffde76a96c06589 100644 (file)
--- 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
index de059c0df09b7577be18192b36087a73f940b883..ba0a27c9c45091fe1edc4d692ab9c120c37131a0 100644 (file)
--- 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
index b17769d62cd711f59cd7b96de4d6eb8ed6e5fe59..e5b3b23ee24b7eb71ebad7662e5d47844d168553 100644 (file)
--- 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
index 3c2b33b33bd95cf52b4c3cd9b01648b1a9cd493e..dd115727b8b6540a95bb476ac72288a6a2867fb9 100644 (file)
--- 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
index 8342f4ffe532d2ce1f37be9bff13e75c5d9a306c..5b98e8299485fafbeb77b0e35ae17adfce018a99 100644 (file)
--- 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
index d117cd4284d535551b563d29323397ae4aa93837..cfcd92af62bed69df7a23244ddd85e17b46ab9c7 100644 (file)
--- 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
index 0ce9756cd44b7b8caf591bdba18008b43c23aabf..6ce51480a587283dbc8946a277c9e664ab5ab7d2 100644 (file)
--- 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
index a6cda8b48bff4ba00875a63280959b0dadbe1941..be55a7d36db9606c70fb36f34a965ec80f72b504 100644 (file)
--- 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
index e20494087bd31bf65fde329d6105820baee73185..faaf08a867bb9a190f8b7fca3ff4816f0458580f 100644 (file)
--- 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
index cf88163b66a858fab3528c7593ade615322b652a..73d41245213fd11032b3f5310b66c09994c92741 100644 (file)
--- 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
index 3cb06178d5cfa51c090a042d42d501f11a690f0a..d6db4154db8573a57cc0cc052c4f1dc48af5a2c0 100644 (file)
--- 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
index 3ebb10bdc89a28b7396a9e68248424b9522f9ccb..d506348994d58eed3c966fee45cffb3ce3da70ac 100644 (file)
--- 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
index 466ed536f5f00d68c1916764f475653893df503c..3cb6fc8db1754b6976aba6d3975e1d9173d6bdf2 100644 (file)
--- 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
index 4ae3411d6bad46849f97710434505414bb24e46c..d26195fb101384db43bebcfaafe533166994bcc5 100644 (file)
--- 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
index 645f45968e3113046234523abdf7e0b1b239dd8d..27c8ef6be3e0ddc594a2854a7f29cf7574b164c1 100644 (file)
--- 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
index c3913251097c39df88c4a3e3a2dd997fc07633be..bd9a88beeedae7b63e3bfe66eea3afb626c2d456 100644 (file)
--- 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
index ea600330672d0ce0d606bc01052653912f6221da..9c7b322c6230c98201f7d444cb70f76f17bb9df6 100644 (file)
--- 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 {