diff options
36 files changed, 56 insertions, 56 deletions
diff --git a/ext/aspell/aspell.c b/ext/aspell/aspell.c index 5413657248..41b9f3f1b7 100644 --- a/ext/aspell/aspell.c +++ b/ext/aspell/aspell.c @@ -20,7 +20,7 @@ #include "php.h" -#if defined(COMPILE_DL) || defined(COMPILE_DL_ASPELL) +#ifdef COMPILE_DL_ASPELL #include "phpdl.h" #endif #include <stdlib.h> @@ -48,7 +48,7 @@ zend_module_entry aspell_module_entry = { }; -#if defined(COMPILE_DL) || defined(COMPILE_DL_ASPELL) +#ifdef COMPILE_DL_ASPELL ZEND_GET_MODULE(aspell) #endif diff --git a/ext/bcmath/bcmath.c b/ext/bcmath/bcmath.c index 2756e6e392..d66fce78e3 100644 --- a/ext/bcmath/bcmath.c +++ b/ext/bcmath/bcmath.c @@ -40,7 +40,7 @@ zend_module_entry bcmath_module_entry = { "bcmath", bcmath_functions, NULL, NULL, PHP_RINIT(bcmath), PHP_RSHUTDOWN(bcmath), NULL, STANDARD_MODULE_PROPERTIES }; -#if defined(COMPILE_DL) || defined(COMPILE_DL_BCMATH) +#ifdef COMPILE_DL_BCMATH ZEND_GET_MODULE(bcmath) #endif diff --git a/ext/cpdf/cpdf.c b/ext/cpdf/cpdf.c index 1e0f5cebd7..479109ca4c 100644 --- a/ext/cpdf/cpdf.c +++ b/ext/cpdf/cpdf.c @@ -158,7 +158,7 @@ zend_module_entry cpdf_module_entry = { "cpdf", cpdf_functions, PHP_MINIT(cpdf), PHP_MSHUTDOWN(cpdf), PHP_RINIT(cpdf), NULL, PHP_MINFO(cpdf), STANDARD_MODULE_PROPERTIES }; -#if defined(COMPILE_DL) || defined(COMPILE_DL_CPDF) +#ifdef COMPILE_DL_CPDF #include "dl/phpdl.h" ZEND_GET_MODULE(cpdf) #endif diff --git a/ext/dav/dav.c b/ext/dav/dav.c index 74ac4aa407..6b111befb8 100644 --- a/ext/dav/dav.c +++ b/ext/dav/dav.c @@ -19,7 +19,7 @@ /* $Id$ */ #define IS_EXT_MODULE -#if defined(COMPILE_DL) || defined(COMPILE_DL_DAV) +#ifdef COMPILE_DL_DAV # if PHP_31 # include "../phpdl.h" # else @@ -68,7 +68,7 @@ phpdav_module php_dav_module; /* }}} */ /* {{{ dynamically loadable module stuff */ -#if defined(COMPILE_DL) || defined(COMPILE_DL_DAV) +#ifdef COMPILE_DL_DAV ZEND_GET_MODULE(phpdav) # endif /* COMPILE_DL */ diff --git a/ext/db/db.c b/ext/db/db.c index 607c5d861a..07cdefc5ba 100644 --- a/ext/db/db.c +++ b/ext/db/db.c @@ -19,7 +19,7 @@ /* $Id$ */ #define IS_EXT_MODULE -#if defined(COMPILE_DL) || defined(COMPILE_DL_DB) +#ifdef COMPILE_DL_DB # include "dl/phpdl.h" #endif @@ -1172,7 +1172,7 @@ zend_module_entry dbm_module_entry = { "db", dbm_functions, PHP_MINIT(db), PHP_MSHUTDOWN(db), PHP_RINIT(db), NULL, PHP_MINFO(db), STANDARD_MODULE_PROPERTIES }; -#if defined(COMPILE_DL) || defined(COMPILE_DL_DB) +#ifdef COMPILE_DL_DB ZEND_GET_MODULE(dbm) #endif diff --git a/ext/dbase/dbase.c b/ext/dbase/dbase.c index d70dec9aff..0b604199c3 100644 --- a/ext/dbase/dbase.c +++ b/ext/dbase/dbase.c @@ -15,7 +15,7 @@ | Authors: Jim Winstead (jimw@php.net) | +----------------------------------------------------------------------+ */ -#if defined(COMPILE_DL) || defined(COMPILE_DL_DBASE) +#ifdef COMPILE_DL_DBASE #include "dl/phpdl.h" #endif @@ -69,7 +69,7 @@ PHP_MINIT_FUNCTION(dbase) { #if defined(THREAD_SAFE) dbase_global_struct *dbase_globals; -#if defined(COMPILE_DL) || defined(COMPILE_DL_DBASE) +#ifdef COMPILE_DL_DBASE CREATE_MUTEX(dbase_mutex,"DBase_TLS"); SET_MUTEX(dbase_mutex); numthreads++; @@ -94,7 +94,7 @@ static PHP_MSHUTDOWN_FUNCTION(dbase) dbase_globals = TlsGetValue(DbaseTls); if (dbase_globals != 0) LocalFree((HLOCAL) dbase_globals); -#if defined(COMPILE_DL) || defined(COMPILE_DL_DBASE) +#ifdef COMPILE_DL_DBASE SET_MUTEX(dbase_mutex); numthreads--; if (!numthreads){ @@ -730,7 +730,7 @@ zend_module_entry dbase_module_entry = { }; -#if defined(COMPILE_DL) || defined(COMPILE_DL_DBASE) +#ifdef COMPILE_DL_DBASE ZEND_GET_MODULE(dbase) #if (WIN32|WINNT) && defined(THREAD_SAFE) diff --git a/ext/fdf/fdf.c b/ext/fdf/fdf.c index 0a9080d483..7b127f57e8 100644 --- a/ext/fdf/fdf.c +++ b/ext/fdf/fdf.c @@ -103,7 +103,7 @@ zend_module_entry fdf_module_entry = { PHP_MINFO(fdf), STANDARD_MODULE_PROPERTIES }; -#if defined(COMPILE_DL) || defined(COMPILE_DL_FDF) +#ifdef COMPILE_DL_FDF #include "dl/phpdl.h" ZEND_GET_MODULE(fdf) #endif diff --git a/ext/filepro/filepro.c b/ext/filepro/filepro.c index f1cab70c2f..1f3669a5a1 100644 --- a/ext/filepro/filepro.c +++ b/ext/filepro/filepro.c @@ -76,7 +76,7 @@ PHP_MINIT_FUNCTION(filepro) { #ifdef THREAD_SAFE fp_global_struct *fp_globals; -#if defined(COMPILE_DL) || defined(COMPILE_DL_FILEPRO) +#ifdef COMPILE_DL_FILEPRO CREATE_MUTEX(fp_mutex,"FP_TLS"); SET_MUTEX(fp_mutex); numthreads++; @@ -105,7 +105,7 @@ PHP_MSHUTDOWN_FUNCTION(filepro) fp_globals = TlsGetValue(FPTls); if (fp_globals != 0) LocalFree((HLOCAL) fp_globals); -#if defined(COMPILE_DL) || defined(COMPILE_DL_FILEPRO) +#ifdef COMPILE_DL_FILEPRO SET_MUTEX(fp_mutex); numthreads--; if (!numthreads){ @@ -136,7 +136,7 @@ zend_module_entry filepro_module_entry = { }; -#if defined(COMPILE_DL) || defined(COMPILE_DL_FILEPRO) +#ifdef COMPILE_DL_FILEPRO #include "dl/phpdl.h" ZEND_GET_MODULE(filepro) #if (WIN32|WINNT) && defined(THREAD_SAFE) diff --git a/ext/gd/gd.c b/ext/gd/gd.c index b8d3b76825..7972693bb7 100644 --- a/ext/gd/gd.c +++ b/ext/gd/gd.c @@ -161,7 +161,7 @@ int gd_globals_id; static php_gd_globals gd_globals; #endif -#if defined(COMPILE_DL) || defined(COMPILE_DL_GD) +#ifdef COMPILE_DL_GD # include "dl/phpdl.h" ZEND_GET_MODULE(gd) #endif diff --git a/ext/hyperwave/hw.c b/ext/hyperwave/hw.c index fdcf4c2832..038cecaf64 100644 --- a/ext/hyperwave/hw.c +++ b/ext/hyperwave/hw.c @@ -17,7 +17,7 @@ */ /* $Id$ */ -#if defined(COMPILE_DL) || defined(COMPILE_DL_HYPERWAVE) +#ifdef COMPILE_DL_HYPERWAVE #include "dl/phpdl.h" #endif @@ -125,13 +125,13 @@ int hw_globals_id; PHP_HW_API php_hw_globals hw_globals; #endif -#if defined(COMPILE_DL) || defined(COMPILE_DL_HYPERWAVE) +#ifdef COMPILE_DL_HYPERWAVE ZEND_GET_MODULE(hw) #endif void print_msg(hg_msg *msg, char *str, int txt); -#if defined(COMPILE_DL) || defined(COMPILE_DL_HYPERWAVE) +#ifdef COMPILE_DL_HYPERWAVE ZEND_GET_MODULE(hw) #endif diff --git a/ext/icap/php_icap.c b/ext/icap/php_icap.c index 5335a93636..e415d38558 100644 --- a/ext/icap/php_icap.c +++ b/ext/icap/php_icap.c @@ -36,7 +36,7 @@ #include "php.h" -#if defined(COMPILE_DL) || defined(COMPILE_DL_ICAP) +#ifdef COMPILE_DL_ICAP #include "dl/phpdl.h" #endif @@ -101,7 +101,7 @@ zend_module_entry php_icap_module_entry = { }; -#if defined(COMPILE_DL) || defined(COMPILE_DL_ICAP) +#ifdef COMPILE_DL_ICAP ZEND_GET_MODULE(php_icap) #endif diff --git a/ext/imap/php_imap.c b/ext/imap/php_imap.c index c82a859757..ae792b3312 100644 --- a/ext/imap/php_imap.c +++ b/ext/imap/php_imap.c @@ -157,7 +157,7 @@ zend_module_entry imap_module_entry = { }; -#if defined(COMPILE_DL) || defined(COMPILE_DL_IMAP) +#ifdef COMPILE_DL_IMAP ZEND_GET_MODULE(imap) #endif diff --git a/ext/interbase/interbase.c b/ext/interbase/interbase.c index 223aed1017..94c8c4d179 100644 --- a/ext/interbase/interbase.c +++ b/ext/interbase/interbase.c @@ -108,7 +108,7 @@ zend_module_entry ibase_module_entry = STANDARD_MODULE_PROPERTIES }; -#if defined(COMPILE_DL) || defined(COMPILE_DL_INTERBASE) +#ifdef COMPILE_DL_INTERBASE #include "dl/phpdl.h" ZEND_GET_MODULE(ibase) @@ -526,7 +526,7 @@ PHP_MINFO_FUNCTION(ibase) php_info_print_table_start(); php_info_print_table_row(2, "Interbase Support", "enabled"); php_info_print_table_row(2, "Revision", "$Revision$"); -#if defined(COMPILE_DL) || defined(COMPILE_DL_INTERBASE) +#ifdef COMPILE_DL_INTERBASE php_info_print_table_row(2, "Dynamic Module", "yes"); #endif php_info_print_table_row(2, "Allow Persistent Links", (IBG(allow_persistent)?"Yes":"No") ); diff --git a/ext/ldap/ldap.c b/ext/ldap/ldap.c index eb9bde6ed2..b510e29a11 100644 --- a/ext/ldap/ldap.c +++ b/ext/ldap/ldap.c @@ -100,7 +100,7 @@ zend_module_entry ldap_module_entry = { -#if defined(COMPILE_DL) || defined(COMPILE_DL_LDAP) +#ifdef COMPILE_DL_LDAP ZEND_GET_MODULE(ldap) #endif diff --git a/ext/mcal/php_mcal.c b/ext/mcal/php_mcal.c index aee722c970..74934b1198 100644 --- a/ext/mcal/php_mcal.c +++ b/ext/mcal/php_mcal.c @@ -36,7 +36,7 @@ #include "php.h" -#if defined(COMPILE_DL) || defined(COMPILE_DL_MCAL) +#ifdef COMPILE_DL_MCAL #include "dl/phpdl.h" #endif @@ -127,7 +127,7 @@ zend_module_entry php_mcal_module_entry = { "mcal", mcal_functions, PHP_MINIT(mcal), NULL, NULL, NULL, PHP_MINFO(mcal), STANDARD_MODULE_PROPERTIES }; -#if defined(COMPILE_DL) || defined(COMPILE_DL_MCAL) +#ifdef COMPILE_DL_MCAL ZEND_GET_MODULE(php_mcal) #endif diff --git a/ext/msql/php_msql.c b/ext/msql/php_msql.c index 1853726568..dab1171a25 100644 --- a/ext/msql/php_msql.c +++ b/ext/msql/php_msql.c @@ -19,7 +19,7 @@ /* $Id$ */ #include "php.h" -#if defined(COMPILE_DL) || defined(COMPILE_DL_MSQL) +#ifdef COMPILE_DL_MSQL #include "dl/phpdl.h" #include "functions/dl.h" #endif @@ -107,7 +107,7 @@ zend_module_entry msql_module_entry = { }; -#if defined(COMPILE_DL) || defined(COMPILE_DL_MSQL) +#ifdef COMPILE_DL_MSQL ZEND_GET_MODULE(msql) #endif diff --git a/ext/mssql/php_mssql.c b/ext/mssql/php_mssql.c index 8d85ace5b0..0178c45110 100644 --- a/ext/mssql/php_mssql.c +++ b/ext/mssql/php_mssql.c @@ -18,7 +18,7 @@ /* $Id$ */ -#if defined(COMPILE_DL) || defined(COMPILE_DL_MSSQL) +#ifdef COMPILE_DL_MSSQL #include "dl/phpdl.h" #define HAVE_MSSQL 1 #endif @@ -80,7 +80,7 @@ int mssql_globals_id; PHP_MSSQL_API php_mssql_globals mssql_globals; #endif -#if defined(COMPILE_DL) || defined(COMPILE_DL_MSSQL) +#ifdef COMPILE_DL_MSSQL ZEND_GET_MODULE(mssql) #endif diff --git a/ext/mysql/php_mysql.c b/ext/mysql/php_mysql.c index 0d133a2c6a..caa6ad5850 100644 --- a/ext/mysql/php_mysql.c +++ b/ext/mysql/php_mysql.c @@ -151,7 +151,7 @@ zend_module_entry mysql_module_entry = { ZEND_DECLARE_MODULE_GLOBALS(mysql) -#if defined(COMPILE_DL) || defined(COMPILE_DL_MYSQL) +#ifdef COMPILE_DL_MYSQL ZEND_GET_MODULE(mysql) #endif diff --git a/ext/oci8/oci8.c b/ext/oci8/oci8.c index 1c4f13f100..3d4b0c02a4 100644 --- a/ext/oci8/oci8.c +++ b/ext/oci8/oci8.c @@ -93,7 +93,7 @@ PHP_OCI_API php_oci_globals oci_globals; /* }}} */ /* {{{ dynamically loadable module stuff */ -#if defined(COMPILE_DL) || defined(COMPILE_DL_OCI8) +#ifdef COMPILE_DL_OCI8 ZEND_GET_MODULE(oci8) #endif /* COMPILE_DL */ diff --git a/ext/odbc/php_odbc.c b/ext/odbc/php_odbc.c index 79c533ddca..6c65216b53 100644 --- a/ext/odbc/php_odbc.c +++ b/ext/odbc/php_odbc.c @@ -20,7 +20,7 @@ /* $Id$ */ -#if defined(COMPILE_DL) || defined(COMPILE_DL_ODBC) +#ifdef COMPILE_DL_ODBC #include "dl/phpdl.h" #endif @@ -133,7 +133,7 @@ int odbc_globals_id; ZEND_API php_odbc_globals odbc_globals; #endif -#if defined(COMPILE_DL) || defined(COMPILE_DL_ODBC) +#ifdef COMPILE_DL_ODBC ZEND_GET_MODULE(odbc) #endif diff --git a/ext/odbc/velocis.c b/ext/odbc/velocis.c index 301f117373..6c67a524e5 100644 --- a/ext/odbc/velocis.c +++ b/ext/odbc/velocis.c @@ -66,7 +66,7 @@ zend_module_entry velocis_module_entry = { }; -#if defined(COMPILE_DL) || defined(COMPILE_DL_ODBC) +#ifdef COMPILE_DL_ODBC ZEND_GET_MODULE(velocis) #endif diff --git a/ext/oracle/oracle.c b/ext/oracle/oracle.c index d3aa76e8f4..d1cdb2b6f3 100644 --- a/ext/oracle/oracle.c +++ b/ext/oracle/oracle.c @@ -25,7 +25,7 @@ #define HAS_OLOG 1 -#if defined(COMPILE_DL) || defined(COMPILE_DL_ORACLE) +#ifdef COMPILE_DL_ORACLE # include "dl/phpdl.h" #endif @@ -181,7 +181,7 @@ static const text *ora_func_tab[] = /* 61, 62 */ (text *) "unused", (text *) "OBNDRA" }; -#if defined(COMPILE_DL) || defined(COMPILE_DL_ORACLE) +#ifdef COMPILE_DL_ORACLE ZEND_GET_MODULE(oracle) #endif diff --git a/ext/pcre/php_pcre.c b/ext/pcre/php_pcre.c index c13897d9e2..d84c5ff744 100644 --- a/ext/pcre/php_pcre.c +++ b/ext/pcre/php_pcre.c @@ -1213,7 +1213,7 @@ zend_module_entry pcre_module_entry = { STANDARD_MODULE_PROPERTIES }; -#if defined(COMPILE_DL) || defined(COMPILE_DL_PCRE) +#ifdef COMPILE_DL_PCRE ZEND_GET_MODULE(pcre) #endif diff --git a/ext/pdf/pdf.c b/ext/pdf/pdf.c index 171ea2a67b..744390aa5a 100644 --- a/ext/pdf/pdf.c +++ b/ext/pdf/pdf.c @@ -168,7 +168,7 @@ zend_module_entry pdf_module_entry = { "pdf", pdf_functions, PHP_MINIT(pdf), PHP_MSHUTDOWN(pdf), NULL, NULL, PHP_MINFO(pdf), STANDARD_MODULE_PROPERTIES }; -#if defined(COMPILE_DL) || defined(COMPILE_DL_PDF) +#ifdef COMPILE_DL_PDF #include "dl/phpdl.h" ZEND_GET_MODULE(pdf) #endif diff --git a/ext/pgsql/pgsql.c b/ext/pgsql/pgsql.c index 0a533c8a77..b5cba0a232 100644 --- a/ext/pgsql/pgsql.c +++ b/ext/pgsql/pgsql.c @@ -21,7 +21,7 @@ #include <stdlib.h> -#if defined(COMPILE_DL) || defined(COMPILE_DL_PGSQL) +#ifdef COMPILE_DL_PGSQL #include "dl/phpdl.h" #endif @@ -81,7 +81,7 @@ zend_module_entry pgsql_module_entry = { "pgsql", pgsql_functions, PHP_MINIT(pgsql), PHP_MSHUTDOWN(pgsql), PHP_RINIT(pgsql), NULL, NULL, STANDARD_MODULE_PROPERTIES }; -#if defined(COMPILE_DL) || defined(COMPILE_DL_PGSQL) +#ifdef COMPILE_DL_PGSQL ZEND_GET_MODULE(pgsql) #endif diff --git a/ext/posix/posix.c b/ext/posix/posix.c index f83725c86d..bf39ac94fa 100644 --- a/ext/posix/posix.c +++ b/ext/posix/posix.c @@ -129,7 +129,7 @@ zend_module_entry posix_module_entry = { STANDARD_MODULE_PROPERTIES }; -#if defined(COMPILE_DL) || defined(COMPILE_DL_POSIX) +#ifdef COMPILE_DL_POSIX ZEND_GET_MODULE(posix) #endif diff --git a/ext/session/session.c b/ext/session/session.c index 45c431b767..8c72b53d55 100644 --- a/ext/session/session.c +++ b/ext/session/session.c @@ -120,7 +120,7 @@ zend_module_entry session_module_entry = { STANDARD_MODULE_PROPERTIES }; -#if defined(COMPILE_DL) || defined(COMPILE_DL_SESSION) +#ifdef COMPILE_DL_SESSION ZEND_GET_MODULE(session) #endif diff --git a/ext/snmp/snmp.c b/ext/snmp/snmp.c index ce3cea8bdd..2a1cfed0f9 100644 --- a/ext/snmp/snmp.c +++ b/ext/snmp/snmp.c @@ -21,7 +21,7 @@ #include "php.h" #include "ext/standard/info.h" -#if defined(COMPILE_DL) || defined(COMPILE_DL_SNMP) +#ifdef COMPILE_DL_SNMP #include "dl/phpdl.h" #endif #include "php_snmp.h" @@ -92,7 +92,7 @@ zend_module_entry snmp_module_entry = { "snmp",snmp_functions,PHP_MINIT(snmp),NULL,NULL,NULL,PHP_MINFO(snmp),STANDARD_MODULE_PROPERTIES }; -#if defined(COMPILE_DL) || defined(COMPILE_DL_SNMP) +#ifdef COMPILE_DL_SNMP ZEND_GET_MODULE(snmp) #endif diff --git a/ext/standard/mail.c b/ext/standard/mail.c index 196079b668..310710d795 100644 --- a/ext/standard/mail.c +++ b/ext/standard/mail.c @@ -34,7 +34,7 @@ #include "win32/sendmail.h" #endif -#if defined(COMPILE_DL) || defined(COMPILE_DL_STANDARD) +#ifdef COMPILE_DL_STANDARD ZEND_GET_MODULE(odbc) #endif diff --git a/ext/swf/swf.c b/ext/swf/swf.c index b8e8d980f3..245208b33a 100644 --- a/ext/swf/swf.c +++ b/ext/swf/swf.c @@ -108,7 +108,7 @@ zend_module_entry swf_module_entry = { STANDARD_MODULE_PROPERTIES }; -#if defined(COMPILE_DL) || defined(COMPILE_DL_SWF) +#ifdef COMPILE_DL_SWF ZEND_GET_MODULE(swf) #endif diff --git a/ext/sybase/sybase.c b/ext/sybase/sybase.c index b97970bbf9..7146fd8e3f 100644 --- a/ext/sybase/sybase.c +++ b/ext/sybase/sybase.c @@ -83,7 +83,7 @@ zend_module_entry sybase_module_entry = { "sybase", sybase_functions, PHP_MINIT(sybase), PHP_MSHUTDOWN(sybase), PHP_RINIT(sybase), PHP_RSHUTDOWN(sybase), PHP_MINFO(sybase), STANDARD_MODULE_PROPERTIES }; -#if defined(COMPILE_DL) || defined(COMPILE_DL_SYBASE) +#ifdef COMPILE_DL_SYBASE ZEND_GET_MODULE(sybase) #endif diff --git a/ext/sybase_ct/php_sybase_ct.c b/ext/sybase_ct/php_sybase_ct.c index 7e1df567a8..5e32d1df61 100644 --- a/ext/sybase_ct/php_sybase_ct.c +++ b/ext/sybase_ct/php_sybase_ct.c @@ -73,7 +73,7 @@ zend_module_entry sybase_module_entry = { "sybase_ct", sybase_functions, PHP_MINIT(sybase), PHP_MSHUTDOWN(sybase), PHP_RINIT(sybase), PHP_RSHUTDOWN(sybase), PHP_MINFO(sybase), STANDARD_MODULE_PROPERTIES }; -#if defined(COMPILE_DL) || defined(COMPILE_DL_SYBASE_CT) +#ifdef COMPILE_DL_SYBASE_CT ZEND_GET_MODULE(sybase) #endif diff --git a/ext/sysvsem/sysvsem.c b/ext/sysvsem/sysvsem.c index 45d3706603..112ea9234b 100644 --- a/ext/sysvsem/sysvsem.c +++ b/ext/sysvsem/sysvsem.c @@ -60,7 +60,7 @@ zend_module_entry sysvsem_module_entry = { "sysvsem", sysvsem_functions, PHP_MINIT(sysvsem), NULL, NULL, NULL, NULL, STANDARD_MODULE_PROPERTIES }; -#if defined(COMPILE_DL) || defined(COMPILE_DL_SYSVSEM) +#ifdef COMPILE_DL_SYSVSEM ZEND_GET_MODULE(sysvsem) #endif diff --git a/ext/sysvshm/sysvshm.c b/ext/sysvshm/sysvshm.c index 9a800fcfa4..1b29f2c0e0 100644 --- a/ext/sysvshm/sysvshm.c +++ b/ext/sysvshm/sysvshm.c @@ -50,7 +50,7 @@ zend_module_entry sysvshm_module_entry = { }; -#if defined(COMPILE_DL) || defined(COMPILE_DL_SYSVSHM) +#ifdef COMPILE_DL_SYSVSHM ZEND_GET_MODULE(sysvshm) #endif diff --git a/ext/xml/xml.c b/ext/xml/xml.c index bd9dc9c58e..84b999cb08 100644 --- a/ext/xml/xml.c +++ b/ext/xml/xml.c @@ -56,7 +56,7 @@ PHP_XML_API php_xml_globals xml_globals; /* {{{ dynamically loadable module stuff */ -#if defined(COMPILE_DL) || defined(COMPILE_DL_XML) +#ifdef COMPILE_DL_XML # include "dl/phpdl.h" ZEND_GET_MODULE(xml) #endif /* COMPILE_DL_XML */ diff --git a/ext/zlib/zlib.c b/ext/zlib/zlib.c index 265567b4b9..b4d0a43e61 100644 --- a/ext/zlib/zlib.c +++ b/ext/zlib/zlib.c @@ -56,7 +56,7 @@ #include <zlib.h> -#if defined(COMPILE_DL) || defined(COMPILE_DL_ZLIB) +#ifdef COMPILE_DL_ZLIB #include "dl/phpdl.h" #ifndef PUTS #define PUTS(a) php_printf("%s",a) @@ -109,7 +109,7 @@ zend_module_entry php_zlib_module_entry = { STANDARD_MODULE_PROPERTIES }; -#if defined(COMPILE_DL) || defined(COMPILE_DL_ZLIB) +#ifdef COMPILE_DL_ZLIB ZEND_GET_MODULE(php_zlib) #endif |