Replace the various get_module() functions with a uniform

ZEND_GET_MODULE(name) macro.

38 files changed, 39 insertions, 39 deletions

diff --git a/ext/aspell/aspell.c b/ext/aspell/aspell.c
index b890f212e2..cb042be998 100644
--- a/ext/aspell/aspell.c
+++ b/ext/aspell/aspell.c
@@ -49,7 +49,7 @@ zend_module_entry aspell_module_entry = {
 
 
 #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)
diff --git a/ext/bcmath/bcmath.c b/ext/bcmath/bcmath.c
index 3bb1aeb38e..ad93588077 100644
--- a/ext/bcmath/bcmath.c
+++ b/ext/bcmath/bcmath.c
@@ -41,7 +41,7 @@ zend_module_entry bcmath_module_entry = {
 };
 
 #if COMPILE_DL
-zend_module_entry *get_module() { return &bcmath_module_entry; };
+ZEND_GET_MODULE(bcmath)
 #endif
 
 #ifndef THREAD_SAFE
diff --git a/ext/cpdf/cpdf.c b/ext/cpdf/cpdf.c
index 30a9b2840b..ebaedb99cd 100644
--- a/ext/cpdf/cpdf.c
+++ b/ext/cpdf/cpdf.c
@@ -160,7 +160,7 @@ zend_module_entry cpdf_module_entry = {
 
 #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)
diff --git a/ext/dav/dav.c b/ext/dav/dav.c
index 021ac4741f..d40954fe50 100644
--- a/ext/dav/dav.c
+++ b/ext/dav/dav.c
@@ -69,7 +69,7 @@ phpdav_module php_dav_module;
 /* {{{ dynamically loadable module stuff */
 
 # if COMPILE_DL
-DLEXPORT zend_module_entry *get_module() { return &phpdav_module_entry; };
+ZEND_GET_MODULE(phpdav)
 # endif /* COMPILE_DL */
 
 /* }}} */
diff --git a/ext/db/db.c b/ext/db/db.c
index 4ea0d09ece..aae6a104a7 100644
--- a/ext/db/db.c
+++ b/ext/db/db.c
@@ -1141,7 +1141,7 @@ zend_module_entry dbm_module_entry = {
 };
 
 #if COMPILE_DL
-DLEXPORT zend_module_entry *get_module(void) { return &dbm_module_entry; }
+ZEND_GET_MODULE(dbm)
 #endif
 
 #endif
diff --git a/ext/dbase/dbase.c b/ext/dbase/dbase.c
index 110f03061a..721759e2df 100644
--- a/ext/dbase/dbase.c
+++ b/ext/dbase/dbase.c
@@ -731,7 +731,7 @@ zend_module_entry dbase_module_entry = {
 
 
 #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)
 
diff --git a/ext/fdf/fdf.c b/ext/fdf/fdf.c
index 0c75cc98b8..fbfc4a1a02 100644
--- a/ext/fdf/fdf.c
+++ b/ext/fdf/fdf.c
@@ -105,7 +105,7 @@ zend_module_entry fdf_module_entry = {
 
 #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) {
diff --git a/ext/filepro/filepro.c b/ext/filepro/filepro.c
index f08812ed97..4195bd3ca5 100644
--- a/ext/filepro/filepro.c
+++ b/ext/filepro/filepro.c
@@ -138,7 +138,7 @@ zend_module_entry filepro_module_entry = {
 
 #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
diff --git a/ext/gd/gd.c b/ext/gd/gd.c
index 438e23a1e9..e08cb624c1 100644
--- a/ext/gd/gd.c
+++ b/ext/gd/gd.c
@@ -172,7 +172,7 @@ static php_gd_globals gd_globals;
 
 #ifdef COMPILE_DL_GD
 # include "dl/phpdl.h"
-DLEXPORT zend_module_entry *get_module(void) { return &gd_module_entry; }
+ZEND_GET_MODULE(gd)
 #endif
 
 
diff --git a/ext/hyperwave/hw.c b/ext/hyperwave/hw.c
index c9432dbbf0..9790d5b8e4 100644
--- a/ext/hyperwave/hw.c
+++ b/ext/hyperwave/hw.c
@@ -126,13 +126,13 @@ PHP_HW_API php_hw_globals hw_globals;
 #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)
diff --git a/ext/icap/php_icap.c b/ext/icap/php_icap.c
index 06322edafd..c5b4037d74 100644
--- a/ext/icap/php_icap.c
+++ b/ext/icap/php_icap.c
@@ -101,7 +101,7 @@ zend_module_entry php_icap_module_entry = {
 
 
 #if COMPILE_DL
-DLEXPORT zend_module_entry *get_module(void) { return &php_icap_module_entry; }
+ZEND_GET_MODULE(php_icap)
 #endif
 
 /* 
diff --git a/ext/imap/php_imap.c b/ext/imap/php_imap.c
index c68235b756..d5557fb857 100644
--- a/ext/imap/php_imap.c
+++ b/ext/imap/php_imap.c
@@ -158,7 +158,7 @@ zend_module_entry imap_module_entry = {
 
 
 #ifdef COMPILE_DL_IMAP
-ZEND_DLEXPORT zend_module_entry *get_module(void) { return &imap_module_entry; }
+ZEND_GET_MODULE(imap)
 #endif
 
 
diff --git a/ext/interbase/interbase.c b/ext/interbase/interbase.c
index dae77868b6..897decf6ef 100644
--- a/ext/interbase/interbase.c
+++ b/ext/interbase/interbase.c
@@ -102,7 +102,7 @@ zend_module_entry ibase_module_entry =
 
 #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)
diff --git a/ext/java/java.c b/ext/java/java.c
index f2dee2059d..b7c2a4dc06 100644
--- a/ext/java/java.c
+++ b/ext/java/java.c
@@ -493,7 +493,7 @@ zend_module_entry java_module_entry = {
   STANDARD_MODULE_PROPERTIES
 };
 
-DLEXPORT zend_module_entry *get_module(void) { return &java_module_entry; }
+ZEND_GET_MODULE(java)
 
 /***************************************************************************/
 
diff --git a/ext/ldap/ldap.c b/ext/ldap/ldap.c
index 24b0873a52..f676205f48 100644
--- a/ext/ldap/ldap.c
+++ b/ext/ldap/ldap.c
@@ -101,7 +101,7 @@ zend_module_entry ldap_module_entry = {
 
 
 #ifdef COMPILE_DL_LDAP
-ZEND_DLEXPORT zend_module_entry *get_module(void ) { return &ldap_module_entry; }
+ZEND_GET_MODULE(ldap)
 #endif
 
 
diff --git a/ext/mcal/php_mcal.c b/ext/mcal/php_mcal.c
index c709179ad5..6ac0925a6a 100644
--- a/ext/mcal/php_mcal.c
+++ b/ext/mcal/php_mcal.c
@@ -127,7 +127,7 @@ zend_module_entry php_mcal_module_entry = {
 };
 
 #if COMPILE_DL
-DLEXPORT zend_module_entry *get_module(void) { return &php_mcal_module_entry; }
+ZEND_GET_MODULE(php_mcal)
 #endif
 
 /* 
diff --git a/ext/msql/php_msql.c b/ext/msql/php_msql.c
index 78572359fe..fe40064c72 100644
--- a/ext/msql/php_msql.c
+++ b/ext/msql/php_msql.c
@@ -108,7 +108,7 @@ zend_module_entry msql_module_entry = {
 
 
 #if COMPILE_DL
-DLEXPORT zend_module_entry *get_module(void) { return &msql_module_entry; }
+ZEND_GET_MODULE(msql)
 #endif
 
 typedef struct {
diff --git a/ext/mssql/php_mssql.c b/ext/mssql/php_mssql.c
index 7bef9ba028..72c2d7fd40 100644
--- a/ext/mssql/php_mssql.c
+++ b/ext/mssql/php_mssql.c
@@ -81,7 +81,7 @@ PHP_MSSQL_API php_mssql_globals mssql_globals;
 #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; } }
diff --git a/ext/mysql/php_mysql.c b/ext/mysql/php_mysql.c
index 8f9d5cb677..d99fe3a752 100644
--- a/ext/mysql/php_mysql.c
+++ b/ext/mysql/php_mysql.c
@@ -152,7 +152,7 @@ zend_module_entry mysql_module_entry = {
 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);
diff --git a/ext/oci8/oci8.c b/ext/oci8/oci8.c
index 8090f5f578..473fef389d 100644
--- a/ext/oci8/oci8.c
+++ b/ext/oci8/oci8.c
@@ -94,7 +94,7 @@ PHP_OCI_API php_oci_globals oci_globals;
 /* {{{ 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 */
 
 /* }}} */
diff --git a/ext/odbc/php_odbc.c b/ext/odbc/php_odbc.c
index 8497a5690a..e928f68990 100644
--- a/ext/odbc/php_odbc.c
+++ b/ext/odbc/php_odbc.c
@@ -132,7 +132,7 @@ ZEND_API php_odbc_globals odbc_globals;
 #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)
diff --git a/ext/odbc/velocis.c b/ext/odbc/velocis.c
index 70d7b958dc..e3a3b6cd04 100644
--- a/ext/odbc/velocis.c
+++ b/ext/odbc/velocis.c
@@ -67,7 +67,7 @@ zend_module_entry velocis_module_entry = {
 
 
 #if COMPILE_DL
-zend_module_entry *get_module() { return &velocis_module_entry; }
+ZEND_GET_MODULE(velocis)
 #endif
 
 THREAD_LS velocis_module php_velocis_module;
diff --git a/ext/oracle/oracle.c b/ext/oracle/oracle.c
index cf71bb8aec..e43dddda8a 100644
--- a/ext/oracle/oracle.c
+++ b/ext/oracle/oracle.c
@@ -182,7 +182,7 @@ static const text *ora_func_tab[] =
 };
 
 #if COMPILE_DL
-DLEXPORT zend_module_entry *get_module() { return &oracle_module_entry; };
+ZEND_GET_MODULE(oracle)
 #endif
 
 static int _close_oraconn(oraConnection *conn)
diff --git a/ext/pcre/php_pcre.c b/ext/pcre/php_pcre.c
index 2c5bc262a5..54ca3b0d3a 100644
--- a/ext/pcre/php_pcre.c
+++ b/ext/pcre/php_pcre.c
@@ -1211,7 +1211,7 @@ zend_module_entry pcre_module_entry = {
 };
 
 #ifdef COMPILE_DL_PCRE
-ZEND_DLEXPORT zend_module_entry *get_module(void) { return &pcre_module_entry; }
+ZEND_GET_MODULE(pcre)
 #endif
 
 /* }}} */
diff --git a/ext/pdf/pdf.c b/ext/pdf/pdf.c
index 6bae1adde4..1755d23bb0 100644
--- a/ext/pdf/pdf.c
+++ b/ext/pdf/pdf.c
@@ -170,7 +170,7 @@ zend_module_entry pdf_module_entry = {
 
 #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)
diff --git a/ext/pgsql/pgsql.c b/ext/pgsql/pgsql.c
index 7deb024a7d..a41289729e 100644
--- a/ext/pgsql/pgsql.c
+++ b/ext/pgsql/pgsql.c
@@ -80,7 +80,7 @@ zend_module_entry pgsql_module_entry = {
 };
 
 #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;
diff --git a/ext/posix/posix.c b/ext/posix/posix.c
index 21221c6184..347269b1c4 100644
--- a/ext/posix/posix.c
+++ b/ext/posix/posix.c
@@ -130,7 +130,7 @@ zend_module_entry posix_module_entry = {
 };
 
 #ifdef COMPILE_DL
-DLEXPORT zend_module_entry *get_module(void) { return &posix_module_entry; }
+ZEND_GET_MODULE(posix)
 #endif
 
 static PHP_MINFO_FUNCTION(posix)
diff --git a/ext/rpc/java/java.c b/ext/rpc/java/java.c
index f2dee2059d..b7c2a4dc06 100644
--- a/ext/rpc/java/java.c
+++ b/ext/rpc/java/java.c
@@ -493,7 +493,7 @@ zend_module_entry java_module_entry = {
   STANDARD_MODULE_PROPERTIES
 };
 
-DLEXPORT zend_module_entry *get_module(void) { return &java_module_entry; }
+ZEND_GET_MODULE(java)
 
 /***************************************************************************/
 
diff --git a/ext/session/session.c b/ext/session/session.c
index 2389584beb..4ca48435b4 100644
--- a/ext/session/session.c
+++ b/ext/session/session.c
@@ -121,7 +121,7 @@ zend_module_entry session_module_entry = {
 };
 
 #ifdef COMPILE_DL_SESSION
-ZEND_DLEXPORT zend_module_entry *get_module(void) { return &session_module_entry; }
+ZEND_GET_MODULE(session)
 #endif
 
 typedef struct {
diff --git a/ext/snmp/snmp.c b/ext/snmp/snmp.c
index 5bcc552a9a..0c4d890d61 100644
--- a/ext/snmp/snmp.c
+++ b/ext/snmp/snmp.c
@@ -93,7 +93,7 @@ zend_module_entry snmp_module_entry = {
 };
 
 #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 */
diff --git a/ext/standard/mail.c b/ext/standard/mail.c
index 77b8dd0a19..758846960c 100644
--- a/ext/standard/mail.c
+++ b/ext/standard/mail.c
@@ -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])
diff --git a/ext/swf/swf.c b/ext/swf/swf.c
index e5283e7147..229b0504b7 100644
--- a/ext/swf/swf.c
+++ b/ext/swf/swf.c
@@ -107,7 +107,7 @@ zend_module_entry swf_module_entry = {
 };
 
 #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)
diff --git a/ext/sybase/sybase.c b/ext/sybase/sybase.c
index a92b95fc4e..de3da678f3 100644
--- a/ext/sybase/sybase.c
+++ b/ext/sybase/sybase.c
@@ -84,7 +84,7 @@ zend_module_entry sybase_module_entry = {
 };
 
 #if COMPILE_DL
-zend_module_entry *get_module() { return &sybase_module_entry; }
+ZEND_GET_MODULE(sybase)
 #endif
 
 THREAD_LS sybase_module php_sybase_module;
diff --git a/ext/sybase_ct/php_sybase_ct.c b/ext/sybase_ct/php_sybase_ct.c
index ec59097b0e..553094bb4f 100644
--- a/ext/sybase_ct/php_sybase_ct.c
+++ b/ext/sybase_ct/php_sybase_ct.c
@@ -74,7 +74,7 @@ zend_module_entry sybase_module_entry = {
 };
 
 #if COMPILE_DL
-zend_module_entry *get_module() { return &sybase_module_entry; }
+ZEND_GET_MODULE(sybase)
 #endif
 
 php_sybase_globals sybase_globals;
diff --git a/ext/sysvsem/sysvsem.c b/ext/sysvsem/sysvsem.c
index e9e040bc93..6c20b63d4c 100644
--- a/ext/sysvsem/sysvsem.c
+++ b/ext/sysvsem/sysvsem.c
@@ -61,7 +61,7 @@ zend_module_entry sysvsem_module_entry = {
 };
 
 #if COMPILE_DL
-zend_module_entry *get_module() { return &sysvsem_module_entry; }
+ZEND_GET_MODULE(sysvsem)
 #endif
 
 
diff --git a/ext/sysvshm/sysvshm.c b/ext/sysvshm/sysvshm.c
index f5c6cad21c..68dbe1b571 100644
--- a/ext/sysvshm/sysvshm.c
+++ b/ext/sysvshm/sysvshm.c
@@ -51,7 +51,7 @@ zend_module_entry sysvshm_module_entry = {
 
 
 #if COMPILE_DL
-zend_module_entry *get_module() { return &sysvshm_module_entry; }
+ZEND_GET_MODULE(sysvshm)
 #endif
 
 #undef shm_ptr					/* undefine AIX-specific macro */
diff --git a/ext/xml/xml.c b/ext/xml/xml.c
index 7576e0af3c..0519939a79 100644
--- a/ext/xml/xml.c
+++ b/ext/xml/xml.c
@@ -58,7 +58,7 @@ PHP_XML_API php_xml_globals xml_globals;
 
 #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 */
 
 /* }}} */
diff --git a/ext/zlib/zlib.c b/ext/zlib/zlib.c
index 6360addd7f..e63b51f464 100644
--- a/ext/zlib/zlib.c
+++ b/ext/zlib/zlib.c
@@ -110,7 +110,7 @@ zend_module_entry php_zlib_module_entry = {
 };
 
 #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) {