More symbol work.

diff --git a/ext/imap/imap.c b/ext/imap/imap.c
index 7d7014c066b17e6cf43caf2d6ce033c5dc0311ea..e6a6326a87afe0fb64f5da532396d05a55f5c1b0 100644 (file)
--- a/ext/imap/imap.c
+++ b/ext/imap/imap.c
@@ -147,7 +147,7 @@ function_entry imap_functions[] = {
 
 
 php3_module_entry php3_imap_module_entry = {
-       IMAPVER, imap_functions, imap_init, NULL, NULL, NULL,imap_info, 0, 0, 0, NULL
+       IMAPVER, imap_functions, PHP_MINIT(imap), NULL, NULL, NULL,PHP_MINFO(imap), 0, 0, 0, NULL
 };
 
 
@@ -206,7 +206,7 @@ inline int add_next_index_object(pval *arg, pval *tmp)
 }
 
 
-void imap_info(void)
+PHP_MINFO_FUNCTION(imap)
 {
        php3_printf("Imap Support enabled<br>");
        php3_printf("<table>");
@@ -219,7 +219,7 @@ void imap_info(void)
        php3_printf("</tr></table>");
 }
 
-int imap_init(INIT_FUNC_ARGS)
+PHP_MINIT_FUNCTION(imap)
 {
 #if !(WIN32|WINNT)
        mail_link(&unixdriver);   /* link in the unix driver */

diff --git a/ext/imap/imap.h b/ext/imap/imap.h
index baefce0d9817cbb8c62599aa02bdd62b48eee941..cf89e029c291fac36e3ea99ee1fdb8287084f5fe 100644 (file)
--- a/ext/imap/imap.h
+++ b/ext/imap/imap.h
@@ -16,8 +16,8 @@
 extern php3_module_entry php3_imap_module_entry;
 #define php3_imap_module_ptr &php3_imap_module_entry
 
-extern int imap_init(INIT_FUNC_ARGS);
-void imap_info(void);
+extern PHP_MINIT_FUNCTION(imap);
+PHP_MINFO_FUNCTION(imap);
 PHP_FUNCTION(imap_open);
 PHP_FUNCTION(imap_reopen);
 PHP_FUNCTION(imap_close);

diff --git a/ext/interbase/interbase.c b/ext/interbase/interbase.c
index 001d68b230d9d21db90eae0f61f03af812817f62..d5361840bacf246791d0a32e720324ce79ab20f5 100644 (file)
--- a/ext/interbase/interbase.c
+++ b/ext/interbase/interbase.c
@@ -20,8 +20,8 @@
 
 /* TODO: A lot... */
 
-#include "php_config.h"
 #include "php.h"
+#include "php_config.h"
 #include "php3_interbase.h"
 
 #if HAVE_IBASE
@@ -32,17 +32,17 @@
 
 /* {{{ extension definition structures */
 function_entry ibase_functions[] = {
-       {"ibase_connect",               php3_ibase_connect,             NULL},
-       {"ibase_pconnect",              php3_ibase_pconnect,    NULL},
-       {"ibase_close",                 php3_ibase_close,               NULL},
-       {"ibase_query",                 php3_ibase_query,               NULL},
-       {"ibase_fetch_row",             php3_ibase_fetch_row,   NULL},
-       {"ibase_free_result",   php3_ibase_free_result, NULL},
-       {"ibase_prepare",               php3_ibase_prepare,             NULL},
-       {"ibase_bind",                  php3_ibase_bind,                NULL},
-       {"ibase_execute",               php3_ibase_execute,             NULL},
-       {"ibase_free_query",    php3_ibase_free_query,  NULL},
-       {"ibase_timefmt",               php3_ibase_timefmt,             NULL},
+       PHP_FE(ibase_connect,                                                   NULL)
+       PHP_FE(ibase_pconnect,                                                  NULL)
+       PHP_FE(ibase_close,                                                             NULL)
+       PHP_FE(ibase_query,                                                             NULL)
+       PHP_FE(ibase_fetch_row,                                                 NULL)
+       PHP_FE(ibase_free_result,                                               NULL)
+       PHP_FE(ibase_prepare,                                                   NULL)
+       PHP_FE(ibase_bind,                                                              NULL)
+       PHP_FE(ibase_execute,                                                   NULL)
+       PHP_FE(ibase_free_query,                                                NULL)
+       PHP_FE(ibase_timefmt,                                                   NULL)
        {NULL, NULL, NULL}
 };
 
@@ -50,11 +50,11 @@ php3_module_entry ibase_module_entry =
 {
        "InterBase",
        ibase_functions,
-       php3_minit_ibase,
+       PHP_MINIT(ibase),
        NULL,
-       php3_rinit_ibase,
+       PHP_RINIT(ibase),
        NULL,
-       php3_info_ibase,
+       PHP_MINFO(ibase),
        STANDARD_MODULE_PROPERTIES
 };
 /* }}} */
@@ -144,7 +144,7 @@ static void _php3_ibase_free_query(ibase_query_handle *query)
 /* }}} */
 
 /* {{{ startup, shutdown and info functions */
-int php3_minit_ibase(INIT_FUNC_ARGS)
+PHP_MINIT_FUNCTION(ibase)
 {
        IBASE_TLS_VARS;
 
@@ -182,7 +182,7 @@ int php3_minit_ibase(INIT_FUNC_ARGS)
        return SUCCESS;
 }
 
-int php3_rinit_ibase(INIT_FUNC_ARGS)
+PHP_RINIT_FUNCTION(ibase)
 {
        IBASE_TLS_VARS;
 
@@ -202,7 +202,7 @@ int php3_rfinish_ibase(void)
 }
 */
 
-void php3_info_ibase(ZEND_MODULE_INFO_FUNC_ARGS)
+PHP_MINFO_FUNCTION(ibase)
 {
        /* TODO */
 }

diff --git a/ext/interbase/php3_interbase.h b/ext/interbase/php3_interbase.h
index 9c5f20f8483c1a3aa3322d40602449b969a53279..30980e51da6d4655bc95138ca3f8cd0ec92957f0 100644 (file)
--- a/ext/interbase/php3_interbase.h
+++ b/ext/interbase/php3_interbase.h
@@ -44,10 +44,11 @@
 extern php3_module_entry ibase_module_entry;
 #define php3_ibase_module_ptr &ibase_module_entry
 
-extern int php3_minit_ibase(INIT_FUNC_ARGS);
-extern int php3_rinit_ibase(INIT_FUNC_ARGS);
-extern int php3_mfinish_ibase(void);
-void php3_info_ibase(ZEND_MODULE_INFO_FUNC_ARGS);
+extern PHP_MINIT_FUNCTION(ibase);
+extern PHP_RINIT_FUNCTION(ibase);
+extern PHP_MSHUTDOWN_FUNCTION(ibase);
+PHP_MINFO_FUNCTION(ibase);
+
 PHP_FUNCTION(ibase_connect);
 PHP_FUNCTION(ibase_pconnect);
 PHP_FUNCTION(ibase_close);

diff --git a/ext/ldap/ldap.c b/ext/ldap/ldap.c
index 20853da281d0a3586deef60de311a62a0ffa8750..60463ca8ea4a13df5830599eb9b84014907e7f92 100644 (file)
--- a/ext/ldap/ldap.c
+++ b/ext/ldap/ldap.c
@@ -66,39 +66,40 @@ ldap_module php3_ldap_module;
 */
 
 function_entry ldap_functions[] = {
-       {"ldap_connect",                                php3_ldap_connect,                              NULL},
-       {"ldap_close",                                  php3_ldap_unbind,                               NULL},
-       {"ldap_bind",                                   php3_ldap_bind,                                 NULL},
-       {"ldap_unbind",                                 php3_ldap_unbind,                               NULL},
-       {"ldap_read",                                   php3_ldap_read,                                 NULL},
-       {"ldap_list",                                   php3_ldap_list,                                 NULL},
-       {"ldap_search",                                 php3_ldap_search,                               NULL},
-       {"ldap_free_result",                    php3_ldap_free_result,                  NULL},
-       {"ldap_count_entries",                  php3_ldap_count_entries,                NULL},
-       {"ldap_first_entry",                    php3_ldap_first_entry,                  NULL},
-       {"ldap_next_entry",                             php3_ldap_next_entry,                   NULL},
-       {"ldap_get_entries",                    php3_ldap_get_entries,                  NULL},
-       {"ldap_first_attribute",                php3_ldap_first_attribute,              NULL},
-       {"ldap_next_attribute",                 php3_ldap_next_attribute,               NULL},
-       {"ldap_get_attributes",                 php3_ldap_get_attributes,               NULL},
-       {"ldap_get_values",                             php3_ldap_get_values,                   NULL},
-       {"ldap_get_dn",                                 php3_ldap_get_dn,                               NULL},
-       {"ldap_explode_dn",                             php3_ldap_explode_dn,                   NULL},
-       {"ldap_dn2ufn",                                 php3_ldap_dn2ufn,                               NULL},
-       {"ldap_add",                                    php3_ldap_add,                                  NULL},
-       {"ldap_delete",                                 php3_ldap_delete,                               NULL},
-       {"ldap_modify",                                 php3_ldap_modify,                               NULL},
+       PHP_FE(ldap_connect,                                                    NULL)
+       PHP_FE(ldap_close,                                                              NULL)
+       PHP_FE(ldap_bind,                                                               NULL)
+       PHP_FE(ldap_unbind,                                                             NULL)
+       PHP_FE(ldap_read,                                                               NULL)
+       PHP_FE(ldap_list,                                                               NULL)
+       PHP_FE(ldap_search,                                                             NULL)
+       PHP_FE(ldap_free_result,                                                NULL)
+       PHP_FE(ldap_count_entries,                                              NULL)
+       PHP_FE(ldap_first_entry,                                                NULL)
+       PHP_FE(ldap_next_entry,                                                 NULL)
+       PHP_FE(ldap_get_entries,                                                NULL)
+       PHP_FE(ldap_first_attribute,                                    NULL)
+       PHP_FE(ldap_next_attribute,                                             NULL)
+       PHP_FE(ldap_get_attributes,                                             NULL)
+       PHP_FE(ldap_get_values,                                                 NULL)
+       PHP_FE(ldap_get_dn,                                                             NULL)
+       PHP_FE(ldap_explode_dn,                                                 NULL)
+       PHP_FE(ldap_dn2ufn,                                                             NULL)
+       PHP_FE(ldap_add,                                                                NULL)
+       PHP_FE(ldap_delete,                                                             NULL)
+       PHP_FE(ldap_modify,                                                             NULL)
 /* additional functions for attribute based modifications, Gerrit Thomson */
-       {"ldap_mod_add",                                php3_ldap_mod_add,                              NULL},
-       {"ldap_mod_replace",                    php3_ldap_mod_replace,                  NULL},
-       {"ldap_mod_del",                                php3_ldap_mod_del,                              NULL},
+       PHP_FE(ldap_mod_add,                                                    NULL)
+       PHP_FE(ldap_mod_replace,                                                NULL)
+       PHP_FE(ldap_mod_del,                                                    NULL)
 /* end gjt mod */
        {NULL, NULL, NULL}
 };
 
 
 php3_module_entry ldap_module_entry = {
-       "LDAP", ldap_functions, php3_minit_ldap, php3_mshutdown_ldap, NULL, NULL, php3_info_ldap, STANDARD_MODULE_PROPERTIES
+       "LDAP", ldap_functions, PHP_MINIT(ldap), PHP_MSHUTDOWN(ldap), NULL, NULL,
+                       PHP_MINFO(ldap), STANDARD_MODULE_PROPERTIES
 };
 
 
@@ -170,7 +171,7 @@ static void _free_ldap_result(LDAPMessage *result)
         ldap_msgfree(result);
 }
 
-int php3_minit_ldap(INIT_FUNC_ARGS)
+PHP_MINIT_FUNCTION(ldap)
 {
 #if defined(THREAD_SAFE)
        ldap_module     *php3_ldap_module;
@@ -240,7 +241,8 @@ int php3_minit_ldap(INIT_FUNC_ARGS)
        return SUCCESS;
 }
 
-int php3_mshutdown_ldap(SHUTDOWN_FUNC_ARGS) {
+PHP_MSHUTDOWN_FUNCTION(ldap)
+{
 #ifdef THREAD_SAFE
        LDAP_TLS_VARS;
        PHP3_TLS_THREAD_FREE(php3_ldap_module);
@@ -255,7 +257,7 @@ int php3_mshutdown_ldap(SHUTDOWN_FUNC_ARGS) {
        return SUCCESS;
 }
 
-void php3_info_ldap(ZEND_MODULE_INFO_FUNC_ARGS)
+PHP_MINFO_FUNCTION(ldap)
 {
        char maxl[16];
 #if HAVE_NSLDAP

diff --git a/ext/ldap/php3_ldap.h b/ext/ldap/php3_ldap.h
index 341cca1ec3b0a29c2f0536be88732b5caec2eb8f..3e8b08f62e27ef65c9622e10cd030d25da041250 100644 (file)
--- a/ext/ldap/php3_ldap.h
+++ b/ext/ldap/php3_ldap.h
@@ -47,10 +47,10 @@ extern php3_module_entry ldap_module_entry;
 #define ldap_module_ptr &ldap_module_entry
 
 /* LDAP functions */
-int php3_minit_ldap(INIT_FUNC_ARGS);
-int php3_mshutdown_ldap(SHUTDOWN_FUNC_ARGS);
+PHP_MINIT_FUNCTION(ldap);
+PHP_MSHUTDOWN_FUNCTION(ldap);
 
-void php3_info_ldap(ZEND_MODULE_INFO_FUNC_ARGS);
+PHP_MINFO_FUNCTION(ldap);
 
 PHP_FUNCTION(ldap_connect);
 

diff --git a/ext/mcrypt/mcrypt.c b/ext/mcrypt/mcrypt.c
index 5d200e8d1da10f59ea876fbea01d152ad556d558..574e254fcdd331c9ff79fd30078396b2ee3d2de9 100644 (file)
--- a/ext/mcrypt/mcrypt.c
+++ b/ext/mcrypt/mcrypt.c
@@ -39,12 +39,12 @@ function_entry mcrypt_functions[] = {
        {0},
 };
 
-static int php_minit_mcrypt(INIT_FUNC_ARGS);
+static PHP_MINIT_FUNCTION(mcrypt);
 
 zend_module_entry mcrypt_module_entry = {
        "mcrypt", 
        mcrypt_functions,
-       php_minit_mcrypt, NULL,
+       PHP_MINIT(mcrypt), NULL,
        NULL, NULL,
        NULL,
        STANDARD_MODULE_PROPERTIES,
@@ -110,7 +110,7 @@ static mcrypt_global_struct mcryptg;
 
 #define MCRYPT_ENTRY(a) REGISTER_LONG_CONSTANT("MCRYPT_" #a, a, CONST_PERSISTENT)
 
-static int php_minit_mcrypt(INIT_FUNC_ARGS)
+static PHP_MINIT_FUNCTION(mcrypt)
 {
        /* modes for mcrypt_??? routines */
        REGISTER_LONG_CONSTANT("MCRYPT_ENCRYPT", 0, CONST_PERSISTENT);