- MFH Cleanup exports and allow to overwrite ext registration

6 files changed, 10 insertions, 12 deletions

diff --git a/main/internal_functions.c.in b/main/internal_functions.c.in
index 9e6d1a1d5e..f1e66b160a 100644
--- 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 4bf1fb20de..df055d2674 100644
--- a/main/internal_functions_nw.c
+++ b/main/internal_functions_nw.c
@@ -84,8 +84,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 0f7aaf7c75..776065d490 100644
--- a/main/internal_functions_win32.c
+++ b/main/internal_functions_win32.c
@@ -193,7 +193,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 f9f65d2cb0..a0d9a7f137 100644
--- 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
@@ -1868,7 +1870,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 8ddd8644df..4555e1bc8f 100644
--- 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 ac3a57bfda..f2fb416231 100644
--- a/main/php.h
+++ b/main/php.h
@@ -317,12 +317,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()