cvs: php4 /ext/aspell/ aspell.c /ext/bcmath/ bcmath.c /ext/cpdf/ cpdf.c /ext/dav/ dav.c /ext/db/ db.c /ext/dbase/ dbase.c /ext/fdf/ fdf.c /ext/filepro/ filepro.c /ext/gd/ gd.c /ext/hyperwave/ hw.c /ext/icap/ php_icap.c /ext/imap/ php_imap.c /ext/interbase/ interbase.c /ext/ldap/ ldap.c /ext/mcal/ php_mcal.c /ext/msql/ php_msql.c /ext/mssql/ php_mssql.c /ext/mysql/ php_mysql.c /ext/oci8/ oci8.c /ext/odbc/ php_odbc.c velocis.c /ext/oracle/ oracle.c /ext/pcre/ php_pcre.c /ext/pdf/ pdf.c /ext/pgsql/ pgsql.c /ext/posix/ posix.c /ext/session/ session.c /ext/snmp/ snmp.c /ext/standard/ mail.c /ext/swf/ swf.c /ext/sybase/ sybase.c /ext/sybase_ct/ php_sybase_ct.c /ext/sysvsem/ sysvsem.c /ext/sysvshm/ sysvshm.c /ext/xml/ xml.c /ext/zlib/ zlib.c
[email protected] ("Sascha Schumann")
| Newsgroups | php.version4 |
|---|---|
| Message-ID | <cvssas959074433@cvsserver> |
sas Tue May 23 11:33:53 2000 EDT
Modified files:
/php4/ext/aspell aspell.c
/php4/ext/bcmath bcmath.c
/php4/ext/cpdf cpdf.c
/php4/ext/dav dav.c
/php4/ext/db db.c
/php4/ext/dbase dbase.c
/php4/ext/fdf fdf.c
/php4/ext/filepro filepro.c
/php4/ext/gd gd.c
/php4/ext/hyperwave hw.c
/php4/ext/icap php_icap.c
/php4/ext/imap php_imap.c
/php4/ext/interbase interbase.c
/php4/ext/ldap ldap.c
/php4/ext/mcal php_mcal.c
/php4/ext/msql php_msql.c
/php4/ext/mssql php_mssql.c
/php4/ext/mysql php_mysql.c
/php4/ext/oci8 oci8.c
/php4/ext/odbc php_odbc.c velocis.c
/php4/ext/oracle oracle.c
/php4/ext/pcre php_pcre.c
/php4/ext/pdf pdf.c
/php4/ext/pgsql pgsql.c
/php4/ext/posix posix.c
/php4/ext/session session.c
/php4/ext/snmp snmp.c
/php4/ext/standard mail.c
/php4/ext/swf swf.c
/php4/ext/sybase sybase.c
/php4/ext/sybase_ct php_sybase_ct.c
/php4/ext/sysvsem sysvsem.c
/php4/ext/sysvshm sysvshm.c
/php4/ext/xml xml.c
/php4/ext/zlib zlib.c
Log:
Use #ifdef COMPILE_DL_EXTNAME solely.
Index: php4/ext/aspell/aspell.c
diff -u php4/ext/aspell/aspell.c:1.20 php4/ext/aspell/aspell.c:1.21
--- php4/ext/aspell/aspell.c:1.20 Thu May 18 17:34:22 2000
+++ php4/ext/aspell/aspell.c Tue May 23 11:33:34 2000
@@ -16,11 +16,11 @@
+----------------------------------------------------------------------+
*/
-/* $Id: aspell.c,v 1.20 2000/05/18 15:34:22 zeev Exp $ */
+/* $Id: aspell.c,v 1.21 2000/05/23 09:33:34 sas Exp $ */
#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 @@
};
-#if defined(COMPILE_DL) || defined(COMPILE_DL_ASPELL)
+#ifdef COMPILE_DL_ASPELL
ZEND_GET_MODULE(aspell)
#endif
Index: php4/ext/bcmath/bcmath.c
diff -u php4/ext/bcmath/bcmath.c:1.19 php4/ext/bcmath/bcmath.c:1.20
--- php4/ext/bcmath/bcmath.c:1.19 Thu May 18 17:34:22 2000
+++ php4/ext/bcmath/bcmath.c Tue May 23 11:33:34 2000
@@ -40,7 +40,7 @@
"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
Index: php4/ext/cpdf/cpdf.c
diff -u php4/ext/cpdf/cpdf.c:1.14 php4/ext/cpdf/cpdf.c:1.15
--- php4/ext/cpdf/cpdf.c:1.14 Tue May 2 02:44:22 2000
+++ php4/ext/cpdf/cpdf.c Tue May 23 11:33:34 2000
@@ -27,7 +27,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: cpdf.c,v 1.14 2000/05/02 00:44:22 sas Exp $ */
+/* $Id: cpdf.c,v 1.15 2000/05/23 09:33:34 sas Exp $ */
/* cpdflib.h -- C language API definitions for ClibPDF library
* Copyright (C) 1998 FastIO Systems, All Rights Reserved.
*/
@@ -158,7 +158,7 @@
"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
Index: php4/ext/dav/dav.c
diff -u php4/ext/dav/dav.c:1.18 php4/ext/dav/dav.c:1.19
--- php4/ext/dav/dav.c:1.18 Thu May 18 17:34:23 2000
+++ php4/ext/dav/dav.c Tue May 23 11:33:34 2000
@@ -16,10 +16,10 @@
+----------------------------------------------------------------------+
*/
-/* $Id: dav.c,v 1.18 2000/05/18 15:34:23 zeev Exp $ */
+/* $Id: dav.c,v 1.19 2000/05/23 09:33:34 sas Exp $ */
#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 @@
/* }}} */
/* {{{ dynamically loadable module stuff */
-#if defined(COMPILE_DL) || defined(COMPILE_DL_DAV)
+#ifdef COMPILE_DL_DAV
ZEND_GET_MODULE(phpdav)
# endif /* COMPILE_DL */
Index: php4/ext/db/db.c
diff -u php4/ext/db/db.c:1.35 php4/ext/db/db.c:1.36
--- php4/ext/db/db.c:1.35 Thu May 18 17:34:23 2000
+++ php4/ext/db/db.c Tue May 23 11:33:35 2000
@@ -17,9 +17,9 @@
+----------------------------------------------------------------------+
*/
-/* $Id: db.c,v 1.35 2000/05/18 15:34:23 zeev Exp $ */
+/* $Id: db.c,v 1.36 2000/05/23 09:33:35 sas Exp $ */
#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 @@
"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
Index: php4/ext/dbase/dbase.c
diff -u php4/ext/dbase/dbase.c:1.22 php4/ext/dbase/dbase.c:1.23
--- php4/ext/dbase/dbase.c:1.22 Thu May 18 17:34:23 2000
+++ php4/ext/dbase/dbase.c Tue May 23 11:33:35 2000
@@ -15,7 +15,7 @@
| Authors: Jim Winstead ([email protected]) |
+----------------------------------------------------------------------+
*/
-#if defined(COMPILE_DL) || defined(COMPILE_DL_DBASE)
+#ifdef COMPILE_DL_DBASE
#include "dl/phpdl.h"
#endif
@@ -69,7 +69,7 @@
{
#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 @@
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 @@
};
-#if defined(COMPILE_DL) || defined(COMPILE_DL_DBASE)
+#ifdef COMPILE_DL_DBASE
ZEND_GET_MODULE(dbase)
#if (WIN32|WINNT) && defined(THREAD_SAFE)
Index: php4/ext/fdf/fdf.c
diff -u php4/ext/fdf/fdf.c:1.23 php4/ext/fdf/fdf.c:1.24
--- php4/ext/fdf/fdf.c:1.23 Thu May 18 17:34:24 2000
+++ php4/ext/fdf/fdf.c Tue May 23 11:33:35 2000
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: fdf.c,v 1.23 2000/05/18 15:34:24 zeev Exp $ */
+/* $Id: fdf.c,v 1.24 2000/05/23 09:33:35 sas Exp $ */
/* FdfTk lib 2.0 is a Complete C/C++ FDF Toolkit available from
http://beta1.adobe.com/ada/acrosdk/forms.html. */
@@ -103,7 +103,7 @@
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
Index: php4/ext/filepro/filepro.c
diff -u php4/ext/filepro/filepro.c:1.21 php4/ext/filepro/filepro.c:1.22
--- php4/ext/filepro/filepro.c:1.21 Thu May 18 17:34:24 2000
+++ php4/ext/filepro/filepro.c Tue May 23 11:33:36 2000
@@ -76,7 +76,7 @@
{
#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 @@
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 @@
};
-#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)
Index: php4/ext/gd/gd.c
diff -u php4/ext/gd/gd.c:1.59 php4/ext/gd/gd.c:1.60
--- php4/ext/gd/gd.c:1.59 Thu May 18 17:34:25 2000
+++ php4/ext/gd/gd.c Tue May 23 11:33:36 2000
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: gd.c,v 1.59 2000/05/18 15:34:25 zeev Exp $ */
+/* $Id: gd.c,v 1.60 2000/05/23 09:33:36 sas Exp $ */
/* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center,
Cold Spring Harbor Labs. */
@@ -161,7 +161,7 @@
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
Index: php4/ext/hyperwave/hw.c
diff -u php4/ext/hyperwave/hw.c:1.53 php4/ext/hyperwave/hw.c:1.54
--- php4/ext/hyperwave/hw.c:1.53 Thu May 18 17:34:26 2000
+++ php4/ext/hyperwave/hw.c Tue May 23 11:33:37 2000
@@ -16,8 +16,8 @@
+----------------------------------------------------------------------+
*/
-/* $Id: hw.c,v 1.53 2000/05/18 15:34:26 zeev Exp $ */
-#if defined(COMPILE_DL) || defined(COMPILE_DL_HYPERWAVE)
+/* $Id: hw.c,v 1.54 2000/05/23 09:33:37 sas Exp $ */
+#ifdef COMPILE_DL_HYPERWAVE
#include "dl/phpdl.h"
#endif
@@ -125,13 +125,13 @@
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
Index: php4/ext/icap/php_icap.c
diff -u php4/ext/icap/php_icap.c:1.10 php4/ext/icap/php_icap.c:1.11
--- php4/ext/icap/php_icap.c:1.10 Sat May 13 11:36:31 2000
+++ php4/ext/icap/php_icap.c Tue May 23 11:33:37 2000
@@ -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 @@
};
-#if defined(COMPILE_DL) || defined(COMPILE_DL_ICAP)
+#ifdef COMPILE_DL_ICAP
ZEND_GET_MODULE(php_icap)
#endif
Index: php4/ext/imap/php_imap.c
diff -u php4/ext/imap/php_imap.c:1.26 php4/ext/imap/php_imap.c:1.27
--- php4/ext/imap/php_imap.c:1.26 Thu May 18 17:34:26 2000
+++ php4/ext/imap/php_imap.c Tue May 23 11:33:38 2000
@@ -23,7 +23,7 @@
| PHP 4.0 updates: Zeev Suraski <[email protected]> |
+----------------------------------------------------------------------+
*/
-/* $Id: php_imap.c,v 1.26 2000/05/18 15:34:26 zeev Exp $ */
+/* $Id: php_imap.c,v 1.27 2000/05/23 09:33:38 sas Exp $ */
#define IMAP41
@@ -157,7 +157,7 @@
};
-#if defined(COMPILE_DL) || defined(COMPILE_DL_IMAP)
+#ifdef COMPILE_DL_IMAP
ZEND_GET_MODULE(imap)
#endif
Index: php4/ext/interbase/interbase.c
diff -u php4/ext/interbase/interbase.c:1.32 php4/ext/interbase/interbase.c:1.33
--- php4/ext/interbase/interbase.c:1.32 Thu May 18 17:34:27 2000
+++ php4/ext/interbase/interbase.c Tue May 23 11:33:38 2000
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: interbase.c,v 1.32 2000/05/18 15:34:27 zeev Exp $ */
+/* $Id: interbase.c,v 1.33 2000/05/23 09:33:38 sas Exp $ */
/* TODO: Arrays, roles?
@@ -108,7 +108,7 @@
STANDARD_MODULE_PROPERTIES
};
-#if defined(COMPILE_DL) || defined(COMPILE_DL_INTERBASE)
+#ifdef COMPILE_DL_INTERBASE
#include "dl/phpdl.h"
ZEND_GET_MODULE(ibase)
@@ -525,8 +525,8 @@
php_info_print_table_start();
php_info_print_table_row(2, "Interbase Support", "enabled");
- php_info_print_table_row(2, "Revision", "$Revision: 1.32 $");
-#if defined(COMPILE_DL) || defined(COMPILE_DL_INTERBASE)
+ php_info_print_table_row(2, "Revision", "$Revision: 1.33 $");
+#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") );
Index: php4/ext/ldap/ldap.c
diff -u php4/ext/ldap/ldap.c:1.38 php4/ext/ldap/ldap.c:1.39
--- php4/ext/ldap/ldap.c:1.38 Thu May 18 17:34:28 2000
+++ php4/ext/ldap/ldap.c Tue May 23 11:33:39 2000
@@ -21,7 +21,7 @@
*/
-/* $Id: ldap.c,v 1.38 2000/05/18 15:34:28 zeev Exp $ */
+/* $Id: ldap.c,v 1.39 2000/05/23 09:33:39 sas Exp $ */
#define IS_EXT_MODULE
#include "php.h"
@@ -100,7 +100,7 @@
-#if defined(COMPILE_DL) || defined(COMPILE_DL_LDAP)
+#ifdef COMPILE_DL_LDAP
ZEND_GET_MODULE(ldap)
#endif
@@ -179,7 +179,7 @@
php_info_print_table_start();
php_info_print_table_row(2, "LDAP Support", "enabled" );
- php_info_print_table_row(2, "RCS Version", "$Id: ldap.c,v 1.38 2000/05/18 15:34:28 zeev Exp $" );
+ php_info_print_table_row(2, "RCS Version", "$Id: ldap.c,v 1.39 2000/05/23 09:33:39 sas Exp $" );
php_info_print_table_row(2, "Total Links", maxl );
#if HAVE_NSLDAP
Index: php4/ext/mcal/php_mcal.c
diff -u php4/ext/mcal/php_mcal.c:1.23 php4/ext/mcal/php_mcal.c:1.24
--- php4/ext/mcal/php_mcal.c:1.23 Sat May 13 11:36:31 2000
+++ php4/ext/mcal/php_mcal.c Tue May 23 11:33:40 2000
@@ -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 @@
"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
Index: php4/ext/msql/php_msql.c
diff -u php4/ext/msql/php_msql.c:1.16 php4/ext/msql/php_msql.c:1.17
--- php4/ext/msql/php_msql.c:1.16 Thu May 18 17:34:29 2000
+++ php4/ext/msql/php_msql.c Tue May 23 11:33:40 2000
@@ -16,10 +16,10 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_msql.c,v 1.16 2000/05/18 15:34:29 zeev Exp $ */
+/* $Id: php_msql.c,v 1.17 2000/05/23 09:33:40 sas Exp $ */
#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 @@
};
-#if defined(COMPILE_DL) || defined(COMPILE_DL_MSQL)
+#ifdef COMPILE_DL_MSQL
ZEND_GET_MODULE(msql)
#endif
Index: php4/ext/mssql/php_mssql.c
diff -u php4/ext/mssql/php_mssql.c:1.20 php4/ext/mssql/php_mssql.c:1.21
--- php4/ext/mssql/php_mssql.c:1.20 Thu May 18 17:34:29 2000
+++ php4/ext/mssql/php_mssql.c Tue May 23 11:33:40 2000
@@ -16,9 +16,9 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_mssql.c,v 1.20 2000/05/18 15:34:29 zeev Exp $ */
+/* $Id: php_mssql.c,v 1.21 2000/05/23 09:33:40 sas Exp $ */
-#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 @@
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
Index: php4/ext/mysql/php_mysql.c
diff -u php4/ext/mysql/php_mysql.c:1.44 php4/ext/mysql/php_mysql.c:1.45
--- php4/ext/mysql/php_mysql.c:1.44 Thu May 18 17:34:30 2000
+++ php4/ext/mysql/php_mysql.c Tue May 23 11:33:41 2000
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_mysql.c,v 1.44 2000/05/18 15:34:30 zeev Exp $ */
+/* $Id: php_mysql.c,v 1.45 2000/05/23 09:33:41 sas Exp $ */
/* TODO:
@@ -151,7 +151,7 @@
ZEND_DECLARE_MODULE_GLOBALS(mysql)
-#if defined(COMPILE_DL) || defined(COMPILE_DL_MYSQL)
+#ifdef COMPILE_DL_MYSQL
ZEND_GET_MODULE(mysql)
#endif
Index: php4/ext/oci8/oci8.c
diff -u php4/ext/oci8/oci8.c:1.81 php4/ext/oci8/oci8.c:1.82
--- php4/ext/oci8/oci8.c:1.81 Thu May 18 17:34:30 2000
+++ php4/ext/oci8/oci8.c Tue May 23 11:33:42 2000
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: oci8.c,v 1.81 2000/05/18 15:34:30 zeev Exp $ */
+/* $Id: oci8.c,v 1.82 2000/05/23 09:33:42 sas Exp $ */
/* TODO list:
*
@@ -93,7 +93,7 @@
/* }}} */
/* {{{ dynamically loadable module stuff */
-#if defined(COMPILE_DL) || defined(COMPILE_DL_OCI8)
+#ifdef COMPILE_DL_OCI8
ZEND_GET_MODULE(oci8)
#endif /* COMPILE_DL */
Index: php4/ext/odbc/php_odbc.c
diff -u php4/ext/odbc/php_odbc.c:1.49 php4/ext/odbc/php_odbc.c:1.50
--- php4/ext/odbc/php_odbc.c:1.49 Sun May 21 10:46:51 2000
+++ php4/ext/odbc/php_odbc.c Tue May 23 11:33:42 2000
@@ -18,9 +18,9 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_odbc.c,v 1.49 2000/05/21 08:46:51 kara Exp $ */
+/* $Id: php_odbc.c,v 1.50 2000/05/23 09:33:42 sas Exp $ */
-#if defined(COMPILE_DL) || defined(COMPILE_DL_ODBC)
+#ifdef COMPILE_DL_ODBC
#include "dl/phpdl.h"
#endif
@@ -133,7 +133,7 @@
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
Index: php4/ext/odbc/velocis.c
diff -u php4/ext/odbc/velocis.c:1.19 php4/ext/odbc/velocis.c:1.20
--- php4/ext/odbc/velocis.c:1.19 Thu May 18 17:34:31 2000
+++ php4/ext/odbc/velocis.c Tue May 23 11:33:43 2000
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: velocis.c,v 1.19 2000/05/18 15:34:31 zeev Exp $ */
+/* $Id: velocis.c,v 1.20 2000/05/23 09:33:43 sas Exp $ */
/*
* TODO:
@@ -66,7 +66,7 @@
};
-#if defined(COMPILE_DL) || defined(COMPILE_DL_ODBC)
+#ifdef COMPILE_DL_ODBC
ZEND_GET_MODULE(velocis)
#endif
Index: php4/ext/oracle/oracle.c
diff -u php4/ext/oracle/oracle.c:1.47 php4/ext/oracle/oracle.c:1.48
--- php4/ext/oracle/oracle.c:1.47 Thu May 18 17:34:31 2000
+++ php4/ext/oracle/oracle.c Tue May 23 11:33:43 2000
@@ -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 @@
/* 61, 62 */ (text *) "unused", (text *) "OBNDRA"
};
-#if defined(COMPILE_DL) || defined(COMPILE_DL_ORACLE)
+#ifdef COMPILE_DL_ORACLE
ZEND_GET_MODULE(oracle)
#endif
Index: php4/ext/pcre/php_pcre.c
diff -u php4/ext/pcre/php_pcre.c:1.52 php4/ext/pcre/php_pcre.c:1.53
--- php4/ext/pcre/php_pcre.c:1.52 Thu May 18 17:34:32 2000
+++ php4/ext/pcre/php_pcre.c Tue May 23 11:33:44 2000
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_pcre.c,v 1.52 2000/05/18 15:34:32 zeev Exp $ */
+/* $Id: php_pcre.c,v 1.53 2000/05/23 09:33:44 sas Exp $ */
/*
TODO:
@@ -1213,7 +1213,7 @@
STANDARD_MODULE_PROPERTIES
};
-#if defined(COMPILE_DL) || defined(COMPILE_DL_PCRE)
+#ifdef COMPILE_DL_PCRE
ZEND_GET_MODULE(pcre)
#endif
Index: php4/ext/pdf/pdf.c
diff -u php4/ext/pdf/pdf.c:1.38 php4/ext/pdf/pdf.c:1.39
--- php4/ext/pdf/pdf.c:1.38 Thu May 18 17:34:32 2000
+++ php4/ext/pdf/pdf.c Tue May 23 11:33:44 2000
@@ -27,7 +27,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: pdf.c,v 1.38 2000/05/18 15:34:32 zeev Exp $ */
+/* $Id: pdf.c,v 1.39 2000/05/23 09:33:44 sas Exp $ */
/* pdflib 2.02 is subject to the ALADDIN FREE PUBLIC LICENSE.
Copyright (C) 1997 Thomas Merz. */
@@ -168,7 +168,7 @@
"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
Index: php4/ext/pgsql/pgsql.c
diff -u php4/ext/pgsql/pgsql.c:1.47 php4/ext/pgsql/pgsql.c:1.48
--- php4/ext/pgsql/pgsql.c:1.47 Tue May 23 08:03:34 2000
+++ php4/ext/pgsql/pgsql.c Tue May 23 11:33:45 2000
@@ -17,11 +17,11 @@
+----------------------------------------------------------------------+
*/
-/* $Id: pgsql.c,v 1.47 2000/05/23 06:03:34 jah Exp $ */
+/* $Id: pgsql.c,v 1.48 2000/05/23 09:33:45 sas Exp $ */
#include <stdlib.h>
-#if defined(COMPILE_DL) || defined(COMPILE_DL_PGSQL)
+#ifdef COMPILE_DL_PGSQL
#include "dl/phpdl.h"
#endif
@@ -81,7 +81,7 @@
"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
Index: php4/ext/posix/posix.c
diff -u php4/ext/posix/posix.c:1.14 php4/ext/posix/posix.c:1.15
--- php4/ext/posix/posix.c:1.14 Tue May 2 02:44:25 2000
+++ php4/ext/posix/posix.c Tue May 23 11:33:45 2000
@@ -27,7 +27,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: posix.c,v 1.14 2000/05/02 00:44:25 sas Exp $ */
+/* $Id: posix.c,v 1.15 2000/05/23 09:33:45 sas Exp $ */
#include "php.h"
@@ -129,14 +129,14 @@
STANDARD_MODULE_PROPERTIES
};
-#if defined(COMPILE_DL) || defined(COMPILE_DL_POSIX)
+#ifdef COMPILE_DL_POSIX
ZEND_GET_MODULE(posix)
#endif
static PHP_MINFO_FUNCTION(posix)
{
php_info_print_table_start();
- php_info_print_table_row(2, "Revision", "$Revision: 1.14 $");
+ php_info_print_table_row(2, "Revision", "$Revision: 1.15 $");
php_info_print_table_end();
}
Index: php4/ext/session/session.c
diff -u php4/ext/session/session.c:1.137 php4/ext/session/session.c:1.138
--- php4/ext/session/session.c:1.137 Thu May 18 17:34:34 2000
+++ php4/ext/session/session.c Tue May 23 11:33:46 2000
@@ -120,7 +120,7 @@
STANDARD_MODULE_PROPERTIES
};
-#if defined(COMPILE_DL) || defined(COMPILE_DL_SESSION)
+#ifdef COMPILE_DL_SESSION
ZEND_GET_MODULE(session)
#endif
Index: php4/ext/snmp/snmp.c
diff -u php4/ext/snmp/snmp.c:1.31 php4/ext/snmp/snmp.c:1.32
--- php4/ext/snmp/snmp.c:1.31 Thu May 18 17:34:34 2000
+++ php4/ext/snmp/snmp.c Tue May 23 11:33:46 2000
@@ -17,11 +17,11 @@
| Steven Lawrance <[email protected]> |
+----------------------------------------------------------------------+
*/
-/* $Id: snmp.c,v 1.31 2000/05/18 15:34:34 zeev Exp $ */
+/* $Id: snmp.c,v 1.32 2000/05/23 09:33:46 sas Exp $ */
#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 @@
"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
Index: php4/ext/standard/mail.c
diff -u php4/ext/standard/mail.c:1.24 php4/ext/standard/mail.c:1.25
--- php4/ext/standard/mail.c:1.24 Thu May 18 17:34:35 2000
+++ php4/ext/standard/mail.c Tue May 23 11:33:47 2000
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: mail.c,v 1.24 2000/05/18 15:34:35 zeev Exp $ */
+/* $Id: mail.c,v 1.25 2000/05/23 09:33:47 sas Exp $ */
#include <stdlib.h>
#include <ctype.h>
@@ -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
Index: php4/ext/swf/swf.c
diff -u php4/ext/swf/swf.c:1.14 php4/ext/swf/swf.c:1.15
--- php4/ext/swf/swf.c:1.14 Tue May 23 06:09:20 2000
+++ php4/ext/swf/swf.c Tue May 23 11:33:47 2000
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: swf.c,v 1.14 2000/05/23 04:09:20 sterling Exp $ */
+/* $Id: swf.c,v 1.15 2000/05/23 09:33:47 sas Exp $ */
#include "php.h"
@@ -108,7 +108,7 @@
STANDARD_MODULE_PROPERTIES
};
-#if defined(COMPILE_DL) || defined(COMPILE_DL_SWF)
+#ifdef COMPILE_DL_SWF
ZEND_GET_MODULE(swf)
#endif
Index: php4/ext/sybase/sybase.c
diff -u php4/ext/sybase/sybase.c:1.30 php4/ext/sybase/sybase.c:1.31
--- php4/ext/sybase/sybase.c:1.30 Thu May 18 17:34:36 2000
+++ php4/ext/sybase/sybase.c Tue May 23 11:33:48 2000
@@ -20,7 +20,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: sybase.c,v 1.30 2000/05/18 15:34:36 zeev Exp $ */
+/* $Id: sybase.c,v 1.31 2000/05/23 09:33:48 sas Exp $ */
#include "php.h"
@@ -83,7 +83,7 @@
"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
Index: php4/ext/sybase_ct/php_sybase_ct.c
diff -u php4/ext/sybase_ct/php_sybase_ct.c:1.22 php4/ext/sybase_ct/php_sybase_ct.c:1.23
--- php4/ext/sybase_ct/php_sybase_ct.c:1.22 Thu May 18 17:34:37 2000
+++ php4/ext/sybase_ct/php_sybase_ct.c Tue May 23 11:33:49 2000
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_sybase_ct.c,v 1.22 2000/05/18 15:34:37 zeev Exp $ */
+/* $Id: php_sybase_ct.c,v 1.23 2000/05/23 09:33:49 sas Exp $ */
#include "php.h"
@@ -73,7 +73,7 @@
"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
Index: php4/ext/sysvsem/sysvsem.c
diff -u php4/ext/sysvsem/sysvsem.c:1.22 php4/ext/sysvsem/sysvsem.c:1.23
--- php4/ext/sysvsem/sysvsem.c:1.22 Thu May 18 17:34:37 2000
+++ php4/ext/sysvsem/sysvsem.c Tue May 23 11:33:49 2000
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: sysvsem.c,v 1.22 2000/05/18 15:34:37 zeev Exp $ */
+/* $Id: sysvsem.c,v 1.23 2000/05/23 09:33:49 sas Exp $ */
/* This has been built and tested on Solaris 2.6 and Linux 2.1.122.
* It may not compile or execute correctly on other systems.
@@ -60,7 +60,7 @@
"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
Index: php4/ext/sysvshm/sysvshm.c
diff -u php4/ext/sysvshm/sysvshm.c:1.25 php4/ext/sysvshm/sysvshm.c:1.26
--- php4/ext/sysvshm/sysvshm.c:1.25 Thu May 18 17:34:37 2000
+++ php4/ext/sysvshm/sysvshm.c Tue May 23 11:33:50 2000
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: sysvshm.c,v 1.25 2000/05/18 15:34:37 zeev Exp $ */
+/* $Id: sysvshm.c,v 1.26 2000/05/23 09:33:50 sas Exp $ */
/* This has been built and tested on Solaris 2.6.
* It may not compile or execute correctly on other systems.
@@ -50,7 +50,7 @@
};
-#if defined(COMPILE_DL) || defined(COMPILE_DL_SYSVSHM)
+#ifdef COMPILE_DL_SYSVSHM
ZEND_GET_MODULE(sysvshm)
#endif
Index: php4/ext/xml/xml.c
diff -u php4/ext/xml/xml.c:1.54 php4/ext/xml/xml.c:1.55
--- php4/ext/xml/xml.c:1.54 Thu May 18 17:34:38 2000
+++ php4/ext/xml/xml.c Tue May 23 11:33:50 2000
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: xml.c,v 1.54 2000/05/18 15:34:38 zeev Exp $ */
+/* $Id: xml.c,v 1.55 2000/05/23 09:33:50 sas Exp $ */
#define IS_EXT_MODULE
#include "php.h"
@@ -56,7 +56,7 @@
/* {{{ 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 */
Index: php4/ext/zlib/zlib.c
diff -u php4/ext/zlib/zlib.c:1.42 php4/ext/zlib/zlib.c:1.43
--- php4/ext/zlib/zlib.c:1.42 Thu May 18 17:34:39 2000
+++ php4/ext/zlib/zlib.c Tue May 23 11:33:51 2000
@@ -16,7 +16,7 @@
| Stefan Röhrich <[email protected]> |
+----------------------------------------------------------------------+
*/
-/* $Id: zlib.c,v 1.42 2000/05/18 15:34:39 zeev Exp $ */
+/* $Id: zlib.c,v 1.43 2000/05/23 09:33:51 sas Exp $ */
#define IS_EXT_MODULE
#include "php.h"
@@ -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 @@
STANDARD_MODULE_PROPERTIES
};
-#if defined(COMPILE_DL) || defined(COMPILE_DL_ZLIB)
+#ifdef COMPILE_DL_ZLIB
ZEND_GET_MODULE(php_zlib)
#endif