More symbol work.

diff --git a/ext/dba/dba.c b/ext/dba/dba.c
index 7024673d216f045e51d9ae42821ab357ee8829ef..af186c1d61205dac6d0f1f014a998df5ce3c10a7 100644 (file)
--- a/ext/dba/dba.c
+++ b/ext/dba/dba.c
@@ -57,16 +57,16 @@ function_entry dba_functions[] = {
        {NULL,NULL,NULL}
 };
 
-static int php3_minit_dba(INIT_FUNC_ARGS);
-static int php3_mshutdown_dba(SHUTDOWN_FUNC_ARGS);
-static void php3_info_dba(ZEND_MODULES_INFO_FUNC_ARGS);
+static PHP_MINIT_FUNCTION(dba);
+static PHP_MSHUTDOWN_FUNCTION(dba);
+static PHP_MINFO_FUNCTION(dba);
 
 php3_module_entry dba_module_entry = {
            "DataBase API", dba_functions, 
-               php3_minit_dba, 
-               php3_mshutdown_dba, 
+               PHP_MINIT(dba), 
+               PHP_MSHUTDOWN(dba), 
                NULL, NULL,
-               php3_info_dba,
+               PHP_MINFO(dba),
                STANDARD_MODULE_PROPERTIES
 };
 
@@ -174,7 +174,7 @@ static void dba_close(dba_info *info)
 /* }}} */
        /* {{{ php3_minit_dba */
 
-static int php3_minit_dba(INIT_FUNC_ARGS)
+static PHP_MINIT_FUNCTION(dba)
 {
        _php3_hash_init(&ht_keys, 0, NULL, NULL, 1);
        GLOBAL(le_db) = register_list_destructors(dba_close, NULL);
@@ -184,7 +184,7 @@ static int php3_minit_dba(INIT_FUNC_ARGS)
 /* }}} */
        /* {{{ php3_mshutdown_dba */
 
-static int php3_mshutdown_dba(SHUTDOWN_FUNC_ARGS)
+static PHP_MSHUTDOWN_FUNCTION(dba)
 {
        _php3_hash_destroy(&ht_keys);
        return SUCCESS;
@@ -192,7 +192,7 @@ static int php3_mshutdown_dba(SHUTDOWN_FUNC_ARGS)
 /* }}} */
        /* {{{ php3_info_dba */
 
-static void php3_info_dba(ZEND_MODULE_INFO_FUNC_ARGS)
+static PHP_MINFO_FUNCTION(dba)
 {
        dba_handler *hptr;
        

diff --git a/ext/dbase/dbase.c b/ext/dbase/dbase.c
index 113807cbf613d2381ec252c228d2e39aa69b0f7f..cdac0642ef0ca8b5a84b671c550be72a0dbfa390 100644 (file)
--- a/ext/dbase/dbase.c
+++ b/ext/dbase/dbase.c
@@ -65,7 +65,7 @@ static void _close_dbase(dbhead_t *dbhead)
 }
 
 
-int php3_minit_dbase(INIT_FUNC_ARGS)
+PHP_MINIT_FUNCTION(dbase)
 {
 #if defined(THREAD_SAFE)
        dbase_global_struct *dbase_globals;
@@ -87,7 +87,8 @@ int php3_minit_dbase(INIT_FUNC_ARGS)
        return SUCCESS;
 }
 
-static int php3_mend_dbase(void){
+static PHP_MSHUTDOWN_FUNCTION(dbase)
+{
 #if defined(THREAD_SAFE)
        dbase_global_struct *dbase_globals;
        dbase_globals = TlsGetValue(DbaseTls); 
@@ -707,22 +708,22 @@ PHP_FUNCTION(dbase_create) {
 /* }}} */
 
 function_entry dbase_functions[] = {
-       {"dbase_open",                  php3_dbase_open,                        NULL},
-       {"dbase_create",                php3_dbase_create,                      NULL},
-       {"dbase_close",                 php3_dbase_close,                       NULL},
-       {"dbase_numrecords",    php3_dbase_numrecords,          NULL},
-       {"dbase_numfields",             php3_dbase_numfields,           NULL},
-       {"dbase_add_record",    php3_dbase_add_record,          NULL},
-       {"dbase_replace_record",        php3_dbase_replace_record,              NULL},
-       {"dbase_get_record",    php3_dbase_get_record,          NULL},
-       {"dbase_get_record_with_names", php3_dbase_get_record_with_names,               NULL},
-       {"dbase_delete_record", php3_dbase_delete_record,       NULL},
-       {"dbase_pack",                  php3_dbase_pack,                        NULL},
+       PHP_FUNCTION(dbase_open,                                                                NULL)
+       PHP_FUNCTION(dbase_create,                                                              NULL)
+       PHP_FUNCTION(dbase_close,                                                               NULL)
+       PHP_FUNCTION(dbase_numrecords,                                                  NULL)
+       PHP_FUNCTION(dbase_numfields,                                                   NULL)
+       PHP_FUNCTION(dbase_add_record,                                                  NULL)
+       PHP_FUNCTION(dbase_replace_record,                                              NULL)
+       PHP_FUNCTION(dbase_get_record,                                                  NULL)
+       PHP_FUNCTION(dbase_get_record_with_names,                               NULL)
+       PHP_FUNCTION(dbase_delete_record,                                               NULL)
+       PHP_FUNCTION(dbase_pack,                                                                NULL)
        {NULL, NULL, NULL}
 };
 
 php3_module_entry dbase_module_entry = {
-       "DBase", dbase_functions, php3_minit_dbase, php3_mend_dbase, NULL, NULL, NULL, STANDARD_MODULE_PROPERTIES
+       "DBase", dbase_functions, PHP_MINIT(dbase), PHP_MSHUTDOWN(dbase), NULL, NULL, NULL, STANDARD_MODULE_PROPERTIES
 };
 
 

diff --git a/ext/dbase/php_dbase.h b/ext/dbase/php_dbase.h
index 3eb82d094b03dbfaf654f1c4a01ee334fcf75493..1f083e7b3aedfa541626cc4d8a20d6e3837966f5 100644 (file)
--- a/ext/dbase/php_dbase.h
+++ b/ext/dbase/php_dbase.h
@@ -35,7 +35,7 @@
 extern php3_module_entry dbase_module_entry;
 #define dbase_module_ptr &dbase_module_entry
 
-extern int php3_minit_dbase(INIT_FUNC_ARGS);
+extern PHP_MINIT_FUNCTION(dbase);
 PHP_FUNCTION(dbase_open);
 PHP_FUNCTION(dbase_create);
 PHP_FUNCTION(dbase_close);