- Cleanup exports and allow to overwrite ext registration

diff --git a/main/internal_functions.c.in b/main/internal_functions.c.in
index 36e24d24752427ab402cde5669ebcbf47285d31c..6b9e502b981fa70a9dde93015face8c3462974bb 100644 (file)
--- a/main/internal_functions.c.in
+++ b/main/internal_functions.c.in
@@ -34,9 +34,8 @@ static zend_module_entry *php_builtin_extensions[] = {
 };
 
 #define EXTCOUNT (sizeof(php_builtin_extensions)/sizeof(zend_module_entry *))
-       
 
-int php_register_internal_extensions(TSRMLS_D)
+PHPAPI int php_register_internal_extensions(TSRMLS_D)
 {
        return php_register_extensions(php_builtin_extensions, EXTCOUNT TSRMLS_CC);
 }

diff --git a/main/internal_functions_nw.c b/main/internal_functions_nw.c
index 429339c88745d3049ef08d8fb15a8dd4888dd29f..afc21afe6f47a9a3cbc4ed97594f11ab6db7ad5d 100644 (file)
--- a/main/internal_functions_nw.c
+++ b/main/internal_functions_nw.c
@@ -83,8 +83,7 @@ static zend_module_entry *php_builtin_extensions[] = {
 
 #define EXTCOUNT (sizeof(php_builtin_extensions)/sizeof(zend_module_entry *))
 
-       
-int php_register_internal_extensions(TSRMLS_D)
+PHPAPI int php_register_internal_extensions(TSRMLS_D)
 {
        return php_register_extensions(php_builtin_extensions, EXTCOUNT TSRMLS_CC);
 }

diff --git a/main/internal_functions_win32.c b/main/internal_functions_win32.c
index bc9fe655cffe922b4da5af130e3ced7a56151357..f67d5d794bee42cc42292d654150807c01e833b0 100644 (file)
--- a/main/internal_functions_win32.c
+++ b/main/internal_functions_win32.c
@@ -157,7 +157,7 @@ static zend_module_entry *php_builtin_extensions[] = {
 
 #define EXTCOUNT (sizeof(php_builtin_extensions)/sizeof(zend_module_entry *))
        
-int php_register_internal_extensions(TSRMLS_D)
+PHPAPI int php_register_internal_extensions(TSRMLS_D)
 {
        return php_register_extensions(php_builtin_extensions, EXTCOUNT TSRMLS_CC);
 }

diff --git a/main/main.c b/main/main.c
index d8f878b0b86be2be00dc8b95358ed96a55031d2d..904bcd8dc36add5a99410309b3200dedcda7a04d 100644 (file)
--- a/main/main.c
+++ b/main/main.c
@@ -91,6 +91,8 @@
 #include "rfc1867.h"
 /* }}} */
 
+PHPAPI int (*php_register_internal_extensions_func)(TSRMLS_D) = php_register_internal_extensions;
+
 #ifndef ZTS
 php_core_globals core_globals;
 #else
@@ -1995,7 +1997,7 @@ int php_module_startup(sapi_module_struct *sf, zend_module_entry *additional_mod
        zend_register_default_classes(TSRMLS_C);
 
        /* startup extensions staticly compiled in */
-       if (php_register_internal_extensions(TSRMLS_C) == FAILURE) {
+       if (php_register_internal_extensions_func(TSRMLS_C) == FAILURE) {
                php_printf("Unable to start builtin modules\n");
                return FAILURE;
        }

diff --git a/main/mergesort.c b/main/mergesort.c
index 8ddd8644df627125c8ca20217a150bdff11699ab..4555e1bc8f599f8359a332e62c9e3aa1873422cd 100644 (file)
--- a/main/mergesort.c
+++ b/main/mergesort.c
@@ -102,7 +102,7 @@ static void insertionsort(u_char *a, size_t n, size_t size, int (*cmp)(const voi
 /* {{{ php_mergesort
  * Arguments are as for qsort.
  */
-int php_mergesort(void *base, size_t nmemb, size_t size, int (*cmp)(const void *, const void * TSRMLS_DC) TSRMLS_DC)
+PHPAPI int php_mergesort(void *base, size_t nmemb, size_t size, int (*cmp)(const void *, const void * TSRMLS_DC) TSRMLS_DC)
 {
        register unsigned int i;
        register int sense;

diff --git a/main/php.h b/main/php.h
index ebfda96c18616c35bfe11cfd025da31dabcabd3a..b7f65235e58102ffa24a96386e03865ea4aac039 100644 (file)
--- a/main/php.h
+++ b/main/php.h
@@ -313,12 +313,10 @@ END_EXTERN_C()
 
 /* functions */
 BEGIN_EXTERN_C()
-int php_register_internal_extensions(TSRMLS_D);
-
-int php_mergesort(void *base, size_t nmemb, register size_t size, int (*cmp)(const void *, const void * TSRMLS_DC) TSRMLS_DC);
-
+PHPAPI extern int (*php_register_internal_extensions_func)(TSRMLS_D);
+PHPAPI int php_register_internal_extensions(TSRMLS_D);
+PHPAPI int php_mergesort(void *base, size_t nmemb, register size_t size, int (*cmp)(const void *, const void * TSRMLS_DC) TSRMLS_DC);
 PHPAPI void php_register_pre_request_shutdown(void (*func)(void *), void *userdata);
-
 PHPAPI void php_com_initialize(TSRMLS_D);
 END_EXTERN_C()