helly Fri Aug 22 12:59:46 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/main internal_functions.c.in internal_functions_nw.c
internal_functions_win32.c main.c mergesort.c php.h
Log:
- MFH Cleanup exports and allow to overwrite ext registration
http://cvs.php.net/viewvc.cgi/php-src/main/internal_functions.c.in?r1=1.30.2.1.2.2&r2=1.30.2.1.2.2.2.1&diff_format=u
Index: php-src/main/internal_functions.c.in
diff -u php-src/main/internal_functions.c.in:1.30.2.1.2.2
php-src/main/internal_functions.c.in:1.30.2.1.2.2.2.1
--- php-src/main/internal_functions.c.in:1.30.2.1.2.2 Mon Jan 1 19:32:09 2007
+++ php-src/main/internal_functions.c.in Fri Aug 22 12:59:46 2008
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: internal_functions.c.in,v 1.30.2.1.2.2 2007/01/01 19:32:09 iliaa Exp $
*/
+/* $Id: internal_functions.c.in,v 1.30.2.1.2.2.2.1 2008/08/22 12:59:46 helly
Exp $ */
#include "php.h"
#include "php_main.h"
@@ -34,9 +34,8 @@
};
#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);
}
http://cvs.php.net/viewvc.cgi/php-src/main/internal_functions_nw.c?r1=1.9.2.1.2.2.2.1&r2=1.9.2.1.2.2.2.2&diff_format=u
Index: php-src/main/internal_functions_nw.c
diff -u php-src/main/internal_functions_nw.c:1.9.2.1.2.2.2.1
php-src/main/internal_functions_nw.c:1.9.2.1.2.2.2.2
--- php-src/main/internal_functions_nw.c:1.9.2.1.2.2.2.1 Mon Dec 31
07:17:17 2007
+++ php-src/main/internal_functions_nw.c Fri Aug 22 12:59:46 2008
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: internal_functions_nw.c,v 1.9.2.1.2.2.2.1 2007/12/31 07:17:17
sebastian Exp $ */
+/* $Id: internal_functions_nw.c,v 1.9.2.1.2.2.2.2 2008/08/22 12:59:46 helly
Exp $ */
/* {{{ includes
*/
@@ -84,8 +84,7 @@
#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);
}
http://cvs.php.net/viewvc.cgi/php-src/main/internal_functions_win32.c?r1=1.87.2.1.2.3.2.1&r2=1.87.2.1.2.3.2.2&diff_format=u
Index: php-src/main/internal_functions_win32.c
diff -u php-src/main/internal_functions_win32.c:1.87.2.1.2.3.2.1
php-src/main/internal_functions_win32.c:1.87.2.1.2.3.2.2
--- php-src/main/internal_functions_win32.c:1.87.2.1.2.3.2.1 Mon Dec 31
07:17:17 2007
+++ php-src/main/internal_functions_win32.c Fri Aug 22 12:59:46 2008
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: internal_functions_win32.c,v 1.87.2.1.2.3.2.1 2007/12/31 07:17:17
sebastian Exp $ */
+/* $Id: internal_functions_win32.c,v 1.87.2.1.2.3.2.2 2008/08/22 12:59:46
helly Exp $ */
/* {{{ includes
*/
@@ -193,7 +193,7 @@
#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);
}
http://cvs.php.net/viewvc.cgi/php-src/main/main.c?r1=1.640.2.23.2.57.2.29&r2=1.640.2.23.2.57.2.30&diff_format=u
Index: php-src/main/main.c
diff -u php-src/main/main.c:1.640.2.23.2.57.2.29
php-src/main/main.c:1.640.2.23.2.57.2.30
--- php-src/main/main.c:1.640.2.23.2.57.2.29 Fri Aug 15 19:47:33 2008
+++ php-src/main/main.c Fri Aug 22 12:59:46 2008
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: main.c,v 1.640.2.23.2.57.2.29 2008/08/15 19:47:33 felipe Exp $ */
+/* $Id: main.c,v 1.640.2.23.2.57.2.30 2008/08/22 12:59:46 helly Exp $ */
/* {{{ includes
*/
@@ -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 @@
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;
}
http://cvs.php.net/viewvc.cgi/php-src/main/mergesort.c?r1=1.15&r2=1.15.6.1&diff_format=u
Index: php-src/main/mergesort.c
diff -u php-src/main/mergesort.c:1.15 php-src/main/mergesort.c:1.15.6.1
--- php-src/main/mergesort.c:1.15 Thu Sep 23 15:57:30 2004
+++ php-src/main/mergesort.c Fri Aug 22 12:59:46 2008
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*/
-/* $Id: mergesort.c,v 1.15 2004/09/23 15:57:30 hyanantha Exp $ */
+/* $Id: mergesort.c,v 1.15.6.1 2008/08/22 12:59:46 helly Exp $ */
#if defined(LIBC_SCCS) && !defined(lint)
static char sccsid[] = "@(#)merge.c 8.2 (Berkeley) 2/14/94";
@@ -102,7 +102,7 @@
/* {{{ 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;
http://cvs.php.net/viewvc.cgi/php-src/main/php.h?r1=1.221.2.4.2.8.2.9&r2=1.221.2.4.2.8.2.10&diff_format=u
Index: php-src/main/php.h
diff -u php-src/main/php.h:1.221.2.4.2.8.2.9
php-src/main/php.h:1.221.2.4.2.8.2.10
--- php-src/main/php.h:1.221.2.4.2.8.2.9 Wed Aug 13 22:40:39 2008
+++ php-src/main/php.h Fri Aug 22 12:59:46 2008
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php.h,v 1.221.2.4.2.8.2.9 2008/08/13 22:40:39 kalle Exp $ */
+/* $Id: php.h,v 1.221.2.4.2.8.2.10 2008/08/22 12:59:46 helly Exp $ */
#ifndef PHP_H
#define PHP_H
@@ -317,12 +317,10 @@
/* 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()
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
