cvs: /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/java java.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

sas Tue May 2 02:30:31 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/java java.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: Replace the various get_module() functions with a uniform ZEND_GET_MODULE(name) macro. Index: php4/ext/aspell/aspell.c diff -u php4/ext/aspell/aspell.c:1.17 php4/ext/aspell/aspell.c:1.18 --- php4/ext/aspell/aspell.c:1.17 Thu Apr 6 00:30:16 2000 +++ php4/ext/aspell/aspell.c Tue May 2 02:30:24 2000 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: aspell.c,v 1.17 2000/04/05 22:30:16 cmv Exp $ */ +/* $Id: aspell.c,v 1.18 2000/05/02 00:30:24 sas Exp $ */ #include "php.h" @@ -49,7 +49,7 @@ #if COMPILE_DL -DLEXPORT zend_module_entry *get_module(void) { return &aspell_module_entry; } +ZEND_GET_MODULE(aspell) #endif static void php_aspell_close(aspell *sc) Index: php4/ext/bcmath/bcmath.c diff -u php4/ext/bcmath/bcmath.c:1.16 php4/ext/bcmath/bcmath.c:1.17 --- php4/ext/bcmath/bcmath.c:1.16 Tue Feb 22 16:48:40 2000 +++ php4/ext/bcmath/bcmath.c Tue May 2 02:30:24 2000 @@ -41,7 +41,7 @@ }; #if COMPILE_DL -zend_module_entry *get_module() { return &bcmath_module_entry; }; +ZEND_GET_MODULE(bcmath) #endif #ifndef THREAD_SAFE Index: php4/ext/cpdf/cpdf.c diff -u php4/ext/cpdf/cpdf.c:1.12 php4/ext/cpdf/cpdf.c:1.13 --- php4/ext/cpdf/cpdf.c:1.12 Thu Apr 6 00:30:16 2000 +++ php4/ext/cpdf/cpdf.c Tue May 2 02:30:25 2000 @@ -27,7 +27,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: cpdf.c,v 1.12 2000/04/05 22:30:16 cmv Exp $ */ +/* $Id: cpdf.c,v 1.13 2000/05/02 00:30:25 sas Exp $ */ /* cpdflib.h -- C language API definitions for ClibPDF library * Copyright (C) 1998 FastIO Systems, All Rights Reserved. */ @@ -160,7 +160,7 @@ #if COMPILE_DL #include "dl/phpdl.h" -DLEXPORT zend_module_entry *get_module(void) { return &cpdf_module_entry; } +ZEND_GET_MODULE(cpdf) #endif static void _free_outline(CPDFoutlineEntry *outline) Index: php4/ext/dav/dav.c diff -u php4/ext/dav/dav.c:1.15 php4/ext/dav/dav.c:1.16 --- php4/ext/dav/dav.c:1.15 Thu Apr 6 00:30:16 2000 +++ php4/ext/dav/dav.c Tue May 2 02:30:25 2000 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: dav.c,v 1.15 2000/04/05 22:30:16 cmv Exp $ */ +/* $Id: dav.c,v 1.16 2000/05/02 00:30:25 sas Exp $ */ #define IS_EXT_MODULE #if COMPILE_DL @@ -69,7 +69,7 @@ /* {{{ dynamically loadable module stuff */ # if COMPILE_DL -DLEXPORT zend_module_entry *get_module() { return &phpdav_module_entry; }; +ZEND_GET_MODULE(phpdav) # endif /* COMPILE_DL */ /* }}} */ Index: php4/ext/db/db.c diff -u php4/ext/db/db.c:1.31 php4/ext/db/db.c:1.32 --- php4/ext/db/db.c:1.31 Sun Apr 30 21:01:15 2000 +++ php4/ext/db/db.c Tue May 2 02:30:25 2000 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: db.c,v 1.31 2000/04/30 19:01:15 andi Exp $ */ +/* $Id: db.c,v 1.32 2000/05/02 00:30:25 sas Exp $ */ #define IS_EXT_MODULE #if COMPILE_DL # include "dl/phpdl.h" @@ -1141,7 +1141,7 @@ }; #if COMPILE_DL -DLEXPORT zend_module_entry *get_module(void) { return &dbm_module_entry; } +ZEND_GET_MODULE(dbm) #endif #endif Index: php4/ext/dbase/dbase.c diff -u php4/ext/dbase/dbase.c:1.19 php4/ext/dbase/dbase.c:1.20 --- php4/ext/dbase/dbase.c:1.19 Sun Apr 30 21:01:16 2000 +++ php4/ext/dbase/dbase.c Tue May 2 02:30:25 2000 @@ -731,7 +731,7 @@ #if defined(COMPILE_DL) -DLEXPORT zend_module_entry *get_module(void) { return &dbase_module_entry; } +ZEND_GET_MODULE(dbase) #if (WIN32|WINNT) && defined(THREAD_SAFE) Index: php4/ext/fdf/fdf.c diff -u php4/ext/fdf/fdf.c:1.20 php4/ext/fdf/fdf.c:1.21 --- php4/ext/fdf/fdf.c:1.20 Thu Apr 6 00:30:18 2000 +++ php4/ext/fdf/fdf.c Tue May 2 02:30:25 2000 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: fdf.c,v 1.20 2000/04/05 22:30:18 cmv Exp $ */ +/* $Id: fdf.c,v 1.21 2000/05/02 00:30:25 sas Exp $ */ /* FdfTk lib 2.0 is a Complete C/C++ FDF Toolkit available from http://beta1.adobe.com/ada/acrosdk/forms.html. */ @@ -105,7 +105,7 @@ #if COMPILE_DL #include "dl/phpdl.h" -DLEXPORT zend_module_entry *get_module(void) { return &fdf_module_entry; } +ZEND_GET_MODULE(fdf) #endif static void phpi_FDFClose(FDFDoc fdf) { Index: php4/ext/filepro/filepro.c diff -u php4/ext/filepro/filepro.c:1.17 php4/ext/filepro/filepro.c:1.18 --- php4/ext/filepro/filepro.c:1.17 Sat Apr 15 16:19:59 2000 +++ php4/ext/filepro/filepro.c Tue May 2 02:30:25 2000 @@ -138,7 +138,7 @@ #if COMPILE_DL #include "dl/phpdl.h" -DLEXPORT zend_module_entry *get_module(void) { return &filepro_module_entry; } +ZEND_GET_MODULE(filepro) #if (WIN32|WINNT) && defined(THREAD_SAFE) /*NOTE: You should have an odbc.def file where you Index: php4/ext/gd/gd.c diff -u php4/ext/gd/gd.c:1.54 php4/ext/gd/gd.c:1.55 --- php4/ext/gd/gd.c:1.54 Tue May 2 00:14:54 2000 +++ php4/ext/gd/gd.c Tue May 2 02:30:26 2000 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: gd.c,v 1.54 2000/05/01 22:14:54 rasmus Exp $ */ +/* $Id: gd.c,v 1.55 2000/05/02 00:30:26 sas Exp $ */ /* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center, Cold Spring Harbor Labs. */ @@ -172,7 +172,7 @@ #ifdef COMPILE_DL_GD # include "dl/phpdl.h" -DLEXPORT zend_module_entry *get_module(void) { return &gd_module_entry; } +ZEND_GET_MODULE(gd) #endif Index: php4/ext/hyperwave/hw.c diff -u php4/ext/hyperwave/hw.c:1.49 php4/ext/hyperwave/hw.c:1.50 --- php4/ext/hyperwave/hw.c:1.49 Thu Apr 6 18:57:32 2000 +++ php4/ext/hyperwave/hw.c Tue May 2 02:30:26 2000 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: hw.c,v 1.49 2000/04/06 16:57:32 cmv Exp $ */ +/* $Id: hw.c,v 1.50 2000/05/02 00:30:26 sas Exp $ */ #if COMPILE_DL #include "dl/phpdl.h" #endif @@ -126,13 +126,13 @@ #endif #ifdef COMPILE_DL -DLEXPORT zend_module_entry *get_module(void) { return &hw_module_entry; } +ZEND_GET_MODULE(hw) #endif void print_msg(hg_msg *msg, char *str, int txt); #if COMPILE_DL -DLEXPORT zend_module_entry *get_module(void) { return &hw_module_entry; } +ZEND_GET_MODULE(hw) #endif void _close_hw_link(hw_connection *conn) Index: php4/ext/icap/php_icap.c diff -u php4/ext/icap/php_icap.c:1.7 php4/ext/icap/php_icap.c:1.8 --- php4/ext/icap/php_icap.c:1.7 Thu Apr 6 18:57:32 2000 +++ php4/ext/icap/php_icap.c Tue May 2 02:30:26 2000 @@ -101,7 +101,7 @@ #if COMPILE_DL -DLEXPORT zend_module_entry *get_module(void) { return &php_icap_module_entry; } +ZEND_GET_MODULE(php_icap) #endif /* Index: php4/ext/imap/php_imap.c diff -u php4/ext/imap/php_imap.c:1.20 php4/ext/imap/php_imap.c:1.21 --- php4/ext/imap/php_imap.c:1.20 Fri Apr 28 16:24:38 2000 +++ php4/ext/imap/php_imap.c Tue May 2 02:30:26 2000 @@ -23,7 +23,7 @@ | PHP 4.0 updates: Zeev Suraski <zeev@zend.com> | +----------------------------------------------------------------------+ */ -/* $Id: php_imap.c,v 1.20 2000/04/28 14:24:38 tedp Exp $ */ +/* $Id: php_imap.c,v 1.21 2000/05/02 00:30:26 sas Exp $ */ #define IMAP41 @@ -158,7 +158,7 @@ #ifdef COMPILE_DL_IMAP -ZEND_DLEXPORT zend_module_entry *get_module(void) { return &imap_module_entry; } +ZEND_GET_MODULE(imap) #endif Index: php4/ext/interbase/interbase.c diff -u php4/ext/interbase/interbase.c:1.22 php4/ext/interbase/interbase.c:1.23 --- php4/ext/interbase/interbase.c:1.22 Sun Apr 30 07:46:04 2000 +++ php4/ext/interbase/interbase.c Tue May 2 02:30:26 2000 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: interbase.c,v 1.22 2000/04/30 05:46:04 jah Exp $ */ +/* $Id: interbase.c,v 1.23 2000/05/02 00:30:26 sas Exp $ */ /* TODO: Arrays, roles? @@ -102,7 +102,7 @@ #if COMPILE_DL #include "dl/phpdl.h" -DLEXPORT php_module_entry *get_module() { return &ibase_module_entry; } +ZEND_GET_MODULE(ibase) #define DL_MALLOC(size) malloc(size) #define DL_STRDUP(str) strdup(str) @@ -508,7 +508,7 @@ php_info_print_table_start(); php_info_print_table_row(2, "Interbase Support", "enabled"); - php_info_print_table_row(2, "Revision", "$Revision: 1.22 $"); + php_info_print_table_row(2, "Revision", "$Revision: 1.23 $"); #ifdef COMPILE_DL php_info_print_table_row(2, "Dynamic Module", "yes"); #endif Index: php4/ext/java/java.c diff -u php4/ext/java/java.c:1.18 php4/ext/java/java.c:1.19 --- php4/ext/java/java.c:1.18 Mon Apr 10 22:21:01 2000 +++ php4/ext/java/java.c Tue May 2 02:30:26 2000 @@ -493,7 +493,7 @@ STANDARD_MODULE_PROPERTIES }; -DLEXPORT zend_module_entry *get_module(void) { return &java_module_entry; } +ZEND_GET_MODULE(java) /***************************************************************************/ Index: php4/ext/ldap/ldap.c diff -u php4/ext/ldap/ldap.c:1.35 php4/ext/ldap/ldap.c:1.36 --- php4/ext/ldap/ldap.c:1.35 Wed Apr 19 15:18:01 2000 +++ php4/ext/ldap/ldap.c Tue May 2 02:30:27 2000 @@ -21,7 +21,7 @@ */ -/* $Id: ldap.c,v 1.35 2000/04/19 13:18:01 zeev Exp $ */ +/* $Id: ldap.c,v 1.36 2000/05/02 00:30:27 sas Exp $ */ #define IS_EXT_MODULE #include "php.h" @@ -101,7 +101,7 @@ #ifdef COMPILE_DL_LDAP -ZEND_DLEXPORT zend_module_entry *get_module(void ) { return &ldap_module_entry; } +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.35 2000/04/19 13:18:01 zeev Exp $" ); + php_info_print_table_row(2, "RCS Version", "$Id: ldap.c,v 1.36 2000/05/02 00:30:27 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.20 php4/ext/mcal/php_mcal.c:1.21 --- php4/ext/mcal/php_mcal.c:1.20 Thu Apr 6 19:05:32 2000 +++ php4/ext/mcal/php_mcal.c Tue May 2 02:30:27 2000 @@ -127,7 +127,7 @@ }; #if COMPILE_DL -DLEXPORT zend_module_entry *get_module(void) { return &php_mcal_module_entry; } +ZEND_GET_MODULE(php_mcal) #endif /* Index: php4/ext/msql/php_msql.c diff -u php4/ext/msql/php_msql.c:1.13 php4/ext/msql/php_msql.c:1.14 --- php4/ext/msql/php_msql.c:1.13 Thu Apr 6 23:07:39 2000 +++ php4/ext/msql/php_msql.c Tue May 2 02:30:27 2000 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_msql.c,v 1.13 2000/04/06 21:07:39 cmv Exp $ */ +/* $Id: php_msql.c,v 1.14 2000/05/02 00:30:27 sas Exp $ */ #include "php.h" #if COMPILE_DL @@ -108,7 +108,7 @@ #if COMPILE_DL -DLEXPORT zend_module_entry *get_module(void) { return &msql_module_entry; } +ZEND_GET_MODULE(msql) #endif typedef struct { Index: php4/ext/mssql/php_mssql.c diff -u php4/ext/mssql/php_mssql.c:1.17 php4/ext/mssql/php_mssql.c:1.18 --- php4/ext/mssql/php_mssql.c:1.17 Thu Apr 20 17:49:56 2000 +++ php4/ext/mssql/php_mssql.c Tue May 2 02:30:27 2000 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_mssql.c,v 1.17 2000/04/20 15:49:56 fmk Exp $ */ +/* $Id: php_mssql.c,v 1.18 2000/05/02 00:30:27 sas Exp $ */ #if COMPILE_DL #include "dl/phpdl.h" @@ -81,7 +81,7 @@ #endif #ifdef COMPILE_DL -DLEXPORT zend_module_entry *get_module(void) { return &mssql_module_entry; }; +ZEND_GET_MODULE(mssql) #endif #define CHECK_LINK(link) { if (link==-1) { php_error(E_WARNING,"MS SQL: A link to the server could not be established"); RETURN_FALSE; } } Index: php4/ext/mysql/php_mysql.c diff -u php4/ext/mysql/php_mysql.c:1.40 php4/ext/mysql/php_mysql.c:1.41 --- php4/ext/mysql/php_mysql.c:1.40 Thu Apr 6 23:07:39 2000 +++ php4/ext/mysql/php_mysql.c Tue May 2 02:30:28 2000 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_mysql.c,v 1.40 2000/04/06 21:07:39 cmv Exp $ */ +/* $Id: php_mysql.c,v 1.41 2000/05/02 00:30:28 sas Exp $ */ /* TODO: @@ -152,7 +152,7 @@ ZEND_DECLARE_MODULE_GLOBALS(mysql) #ifdef COMPILE_DL_MYSQL -ZEND_DLEXPORT zend_module_entry *get_module(void) { return &mysql_module_entry; } +ZEND_GET_MODULE(mysql) #endif void timeout(int sig); Index: php4/ext/oci8/oci8.c diff -u php4/ext/oci8/oci8.c:1.77 php4/ext/oci8/oci8.c:1.78 --- php4/ext/oci8/oci8.c:1.77 Sun Apr 30 21:01:16 2000 +++ php4/ext/oci8/oci8.c Tue May 2 02:30:28 2000 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: oci8.c,v 1.77 2000/04/30 19:01:16 andi Exp $ */ +/* $Id: oci8.c,v 1.78 2000/05/02 00:30:28 sas Exp $ */ /* TODO list: * @@ -94,7 +94,7 @@ /* {{{ dynamically loadable module stuff */ #ifdef COMPILE_DL_OCI8 -DLEXPORT zend_module_entry *get_module() { return &oci8_module_entry; }; +ZEND_GET_MODULE(oci8) #endif /* COMPILE_DL */ /* }}} */ Index: php4/ext/odbc/php_odbc.c diff -u php4/ext/odbc/php_odbc.c:1.41 php4/ext/odbc/php_odbc.c:1.42 --- php4/ext/odbc/php_odbc.c:1.41 Sun Apr 16 18:16:59 2000 +++ php4/ext/odbc/php_odbc.c Tue May 2 02:30:28 2000 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_odbc.c,v 1.41 2000/04/16 16:16:59 lurcher Exp $ */ +/* $Id: php_odbc.c,v 1.42 2000/05/02 00:30:28 sas Exp $ */ #if COMPILE_DL #include "dl/phpdl.h" @@ -132,7 +132,7 @@ #endif #if COMPILE_DL -DLEXPORT zend_module_entry *get_module(void) { return &odbc_module_entry; }; +ZEND_GET_MODULE(odbc) #endif static void _free_odbc_result(odbc_result *res) Index: php4/ext/odbc/velocis.c diff -u php4/ext/odbc/velocis.c:1.16 php4/ext/odbc/velocis.c:1.17 --- php4/ext/odbc/velocis.c:1.16 Thu Apr 6 23:07:40 2000 +++ php4/ext/odbc/velocis.c Tue May 2 02:30:28 2000 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: velocis.c,v 1.16 2000/04/06 21:07:40 cmv Exp $ */ +/* $Id: velocis.c,v 1.17 2000/05/02 00:30:28 sas Exp $ */ /* * TODO: @@ -67,7 +67,7 @@ #if COMPILE_DL -zend_module_entry *get_module() { return &velocis_module_entry; } +ZEND_GET_MODULE(velocis) #endif THREAD_LS velocis_module php_velocis_module; Index: php4/ext/oracle/oracle.c diff -u php4/ext/oracle/oracle.c:1.43 php4/ext/oracle/oracle.c:1.44 --- php4/ext/oracle/oracle.c:1.43 Fri Apr 28 12:37:16 2000 +++ php4/ext/oracle/oracle.c Tue May 2 02:30:28 2000 @@ -182,7 +182,7 @@ }; #if COMPILE_DL -DLEXPORT zend_module_entry *get_module() { return &oracle_module_entry; }; +ZEND_GET_MODULE(oracle) #endif static int _close_oraconn(oraConnection *conn) Index: php4/ext/pcre/php_pcre.c diff -u php4/ext/pcre/php_pcre.c:1.48 php4/ext/pcre/php_pcre.c:1.49 --- php4/ext/pcre/php_pcre.c:1.48 Mon May 1 04:41:44 2000 +++ php4/ext/pcre/php_pcre.c Tue May 2 02:30:28 2000 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_pcre.c,v 1.48 2000/05/01 02:41:44 sas Exp $ */ +/* $Id: php_pcre.c,v 1.49 2000/05/02 00:30:28 sas Exp $ */ /* TODO: @@ -1211,7 +1211,7 @@ }; #ifdef COMPILE_DL_PCRE -ZEND_DLEXPORT zend_module_entry *get_module(void) { return &pcre_module_entry; } +ZEND_GET_MODULE(pcre) #endif /* }}} */ Index: php4/ext/pdf/pdf.c diff -u php4/ext/pdf/pdf.c:1.34 php4/ext/pdf/pdf.c:1.35 --- php4/ext/pdf/pdf.c:1.34 Fri Apr 7 20:50:07 2000 +++ php4/ext/pdf/pdf.c Tue May 2 02:30:29 2000 @@ -27,7 +27,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: pdf.c,v 1.34 2000/04/07 18:50:07 cmv Exp $ */ +/* $Id: pdf.c,v 1.35 2000/05/02 00:30:29 sas Exp $ */ /* pdflib 2.01 is subject to the ALADDIN FREE PUBLIC LICENSE. Copyright (C) 1997 Thomas Merz. */ @@ -170,7 +170,7 @@ #if COMPILE_DL #include "dl/phpdl.h" -DLEXPORT zend_module_entry *get_module(void) { return &pdf_module_entry; } +ZEND_GET_MODULE(pdf) #endif static void _free_pdf_image(int image) Index: php4/ext/pgsql/pgsql.c diff -u php4/ext/pgsql/pgsql.c:1.42 php4/ext/pgsql/pgsql.c:1.43 --- php4/ext/pgsql/pgsql.c:1.42 Mon Mar 6 19:41:15 2000 +++ php4/ext/pgsql/pgsql.c Tue May 2 02:30:29 2000 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: pgsql.c,v 1.42 2000/03/06 18:41:15 ssb Exp $ */ +/* $Id: pgsql.c,v 1.43 2000/05/02 00:30:29 sas Exp $ */ #include <stdlib.h> @@ -80,7 +80,7 @@ }; #if COMPILE_DL -PHP_PGSQL_API zend_module_entry *get_module() { return &pgsql_module_entry; } +ZEND_GET_MODULE(pgsql) #endif static int le_link,le_plink,le_result,le_lofp,le_string; Index: php4/ext/posix/posix.c diff -u php4/ext/posix/posix.c:1.12 php4/ext/posix/posix.c:1.13 --- php4/ext/posix/posix.c:1.12 Mon May 1 23:36:52 2000 +++ php4/ext/posix/posix.c Tue May 2 02:30:29 2000 @@ -27,7 +27,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: posix.c,v 1.12 2000/05/01 21:36:52 sas Exp $ */ +/* $Id: posix.c,v 1.13 2000/05/02 00:30:29 sas Exp $ */ #include "php.h" @@ -130,13 +130,13 @@ }; #ifdef COMPILE_DL -DLEXPORT zend_module_entry *get_module(void) { return &posix_module_entry; } +ZEND_GET_MODULE(posix) #endif static PHP_MINFO_FUNCTION(posix) { php_info_print_table_start(); - php_info_print_table_row(2, "Revision", "$Revision: 1.12 $"); + php_info_print_table_row(2, "Revision", "$Revision: 1.13 $"); php_info_print_table_end(); } Index: php4/ext/session/session.c diff -u php4/ext/session/session.c:1.131 php4/ext/session/session.c:1.132 --- php4/ext/session/session.c:1.131 Mon May 1 04:41:46 2000 +++ php4/ext/session/session.c Tue May 2 02:30:29 2000 @@ -121,7 +121,7 @@ }; #ifdef COMPILE_DL_SESSION -ZEND_DLEXPORT zend_module_entry *get_module(void) { return &session_module_entry; } +ZEND_GET_MODULE(session) #endif typedef struct { Index: php4/ext/snmp/snmp.c diff -u php4/ext/snmp/snmp.c:1.28 php4/ext/snmp/snmp.c:1.29 --- php4/ext/snmp/snmp.c:1.28 Thu Apr 6 23:07:43 2000 +++ php4/ext/snmp/snmp.c Tue May 2 02:30:29 2000 @@ -17,7 +17,7 @@ | Steven Lawrance <slawrance@technologist.com> | +----------------------------------------------------------------------+ */ -/* $Id: snmp.c,v 1.28 2000/04/06 21:07:43 cmv Exp $ */ +/* $Id: snmp.c,v 1.29 2000/05/02 00:30:29 sas Exp $ */ #include "php.h" #include "ext/standard/info.h" @@ -93,7 +93,7 @@ }; #if COMPILE_DL -DLEXPORT zend_module_entry *get_module() { return &snmp_module_entry; }; +ZEND_GET_MODULE(snmp) #endif /* THREAD_LS snmp_module php_snmp_module; - may need one of these at some point */ Index: php4/ext/standard/mail.c diff -u php4/ext/standard/mail.c:1.21 php4/ext/standard/mail.c:1.22 --- php4/ext/standard/mail.c:1.21 Wed Apr 5 23:43:02 2000 +++ php4/ext/standard/mail.c Tue May 2 02:30:29 2000 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: mail.c,v 1.21 2000/04/05 21:43:02 cmv Exp $ */ +/* $Id: mail.c,v 1.22 2000/05/02 00:30:29 sas Exp $ */ #include <stdlib.h> #include <ctype.h> @@ -35,7 +35,7 @@ #endif #if COMPILE_DL -DLEXPORT zend_module_entry *get_module(void) { return &odbc_module_entry; } +ZEND_GET_MODULE(odbc) #endif /* {{{ proto int mail(string to, string subject, string message [, string additional_headers]) Index: php4/ext/swf/swf.c diff -u php4/ext/swf/swf.c:1.4 php4/ext/swf/swf.c:1.5 --- php4/ext/swf/swf.c:1.4 Tue May 2 02:24:18 2000 +++ php4/ext/swf/swf.c Tue May 2 02:30:30 2000 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: swf.c,v 1.4 2000/05/02 00:24:18 sterling Exp $ */ +/* $Id: swf.c,v 1.5 2000/05/02 00:30:30 sas Exp $ */ #include "php.h" @@ -107,7 +107,7 @@ }; #ifdef COMPILE_DL_SWF -ZEND_DLEXPORT zend_module_entry *get_module(void) { return &swf_module_entry; } +ZEND_GET_MODULE(swf) #endif PHP_MINFO_FUNCTION(swf) Index: php4/ext/sybase/sybase.c diff -u php4/ext/sybase/sybase.c:1.26 php4/ext/sybase/sybase.c:1.27 --- php4/ext/sybase/sybase.c:1.26 Thu Apr 6 23:07:44 2000 +++ php4/ext/sybase/sybase.c Tue May 2 02:30:30 2000 @@ -20,7 +20,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: sybase.c,v 1.26 2000/04/06 21:07:44 cmv Exp $ */ +/* $Id: sybase.c,v 1.27 2000/05/02 00:30:30 sas Exp $ */ #include "php.h" @@ -84,7 +84,7 @@ }; #if COMPILE_DL -zend_module_entry *get_module() { return &sybase_module_entry; } +ZEND_GET_MODULE(sybase) #endif THREAD_LS sybase_module php_sybase_module; Index: php4/ext/sybase_ct/php_sybase_ct.c diff -u php4/ext/sybase_ct/php_sybase_ct.c:1.19 php4/ext/sybase_ct/php_sybase_ct.c:1.20 --- php4/ext/sybase_ct/php_sybase_ct.c:1.19 Thu Apr 6 23:07:44 2000 +++ php4/ext/sybase_ct/php_sybase_ct.c Tue May 2 02:30:30 2000 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_sybase_ct.c,v 1.19 2000/04/06 21:07:44 cmv Exp $ */ +/* $Id: php_sybase_ct.c,v 1.20 2000/05/02 00:30:30 sas Exp $ */ #include "php.h" @@ -74,7 +74,7 @@ }; #if COMPILE_DL -zend_module_entry *get_module() { return &sybase_module_entry; } +ZEND_GET_MODULE(sybase) #endif php_sybase_globals sybase_globals; Index: php4/ext/sysvsem/sysvsem.c diff -u php4/ext/sysvsem/sysvsem.c:1.19 php4/ext/sysvsem/sysvsem.c:1.20 --- php4/ext/sysvsem/sysvsem.c:1.19 Fri Apr 14 15:14:30 2000 +++ php4/ext/sysvsem/sysvsem.c Tue May 2 02:30:30 2000 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: sysvsem.c,v 1.19 2000/04/14 13:14:30 rasmus Exp $ */ +/* $Id: sysvsem.c,v 1.20 2000/05/02 00:30:30 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. @@ -61,7 +61,7 @@ }; #if COMPILE_DL -zend_module_entry *get_module() { return &sysvsem_module_entry; } +ZEND_GET_MODULE(sysvsem) #endif Index: php4/ext/sysvshm/sysvshm.c diff -u php4/ext/sysvshm/sysvshm.c:1.21 php4/ext/sysvshm/sysvshm.c:1.22 --- php4/ext/sysvshm/sysvshm.c:1.21 Mon Mar 6 19:41:18 2000 +++ php4/ext/sysvshm/sysvshm.c Tue May 2 02:30:30 2000 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: sysvshm.c,v 1.21 2000/03/06 18:41:18 ssb Exp $ */ +/* $Id: sysvshm.c,v 1.22 2000/05/02 00:30:30 sas Exp $ */ /* This has been built and tested on Solaris 2.6. * It may not compile or execute correctly on other systems. @@ -51,7 +51,7 @@ #if COMPILE_DL -zend_module_entry *get_module() { return &sysvshm_module_entry; } +ZEND_GET_MODULE(sysvshm) #endif #undef shm_ptr /* undefine AIX-specific macro */ Index: php4/ext/xml/xml.c diff -u php4/ext/xml/xml.c:1.51 php4/ext/xml/xml.c:1.52 --- php4/ext/xml/xml.c:1.51 Wed Apr 5 23:43:03 2000 +++ php4/ext/xml/xml.c Tue May 2 02:30:30 2000 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: xml.c,v 1.51 2000/04/05 21:43:03 cmv Exp $ */ +/* $Id: xml.c,v 1.52 2000/05/02 00:30:30 sas Exp $ */ #define IS_EXT_MODULE #include "php.h" @@ -58,7 +58,7 @@ #ifdef COMPILE_DL_XML # include "dl/phpdl.h" -DLEXPORT zend_module_entry *get_module(void) { return &xml_module_entry; } +ZEND_GET_MODULE(xml) #endif /* COMPILE_DL_XML */ /* }}} */ Index: php4/ext/zlib/zlib.c diff -u php4/ext/zlib/zlib.c:1.39 php4/ext/zlib/zlib.c:1.40 --- php4/ext/zlib/zlib.c:1.39 Thu Apr 20 19:24:01 2000 +++ php4/ext/zlib/zlib.c Tue May 2 02:30:31 2000 @@ -16,7 +16,7 @@ | Stefan Röhrich <sr@linux.de> | +----------------------------------------------------------------------+ */ -/* $Id: zlib.c,v 1.39 2000/04/20 17:24:01 zeev Exp $ */ +/* $Id: zlib.c,v 1.40 2000/05/02 00:30:31 sas Exp $ */ #define IS_EXT_MODULE #include "php.h" @@ -110,7 +110,7 @@ }; #if defined(COMPILE_DL) -DLEXPORT zend_module_entry *get_module(void) { return &php_zlib_module_entry; } +ZEND_GET_MODULE(php_zlib) #endif static void phpi_destructor_gzclose(gzFile *zp) {