cvs: ZendEngine2 / zend.c zend_builtin_functions.c zend_builtin_functions.h

helly		Tue Dec 30 18:17:28 2008 UTC

  Modified files:              
    /ZendEngine2	zend.c zend_builtin_functions.c 
                	zend_builtin_functions.h 
  Log:
  Use a module struct for the built-in functions
  
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend.c?r1=1.423&r2=1.424&diff_format=u
Index: ZendEngine2/zend.c
diff -u ZendEngine2/zend.c:1.423 ZendEngine2/zend.c:1.424
--- ZendEngine2/zend.c:1.423	Fri Aug 15 19:45:24 2008
+++ ZendEngine2/zend.c	Tue Dec 30 18:17:28 2008
@@ -17,7 +17,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: zend.c,v 1.423 2008/08/15 19:45:24 felipe Exp $ */
+/* $Id: zend.c,v 1.424 2008/12/30 18:17:28 helly Exp $ */
 
 #include "zend.h"
 #include "zend_extensions.h"
@@ -1243,7 +1243,6 @@
 #endif
 	zend_destroy_rsrc_list(&EG(persistent_list) TSRMLS_CC);
 	zend_hash_graceful_reverse_destroy(&module_registry);
-	zend_shutdown_builtin_functions(TSRMLS_C);
 
 	zend_hash_destroy(GLOBAL_FUNCTION_TABLE);
 	zend_hash_destroy(GLOBAL_CLASS_TABLE);
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_builtin_functions.c?r1=1.390&r2=1.391&diff_format=u
Index: ZendEngine2/zend_builtin_functions.c
diff -u ZendEngine2/zend_builtin_functions.c:1.390 ZendEngine2/zend_builtin_functions.c:1.391
--- ZendEngine2/zend_builtin_functions.c:1.390	Tue Dec  9 19:16:22 2008
+++ ZendEngine2/zend_builtin_functions.c	Tue Dec 30 18:17:28 2008
@@ -17,7 +17,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: zend_builtin_functions.c,v 1.390 2008/12/09 19:16:22 johannes Exp $ */
+/* $Id: zend_builtin_functions.c,v 1.391 2008/12/30 18:17:28 helly Exp $ */
 
 #include "zend.h"
 #include "zend_API.h"
@@ -291,15 +291,23 @@
 };
 /* }}} */
 
-int zend_startup_builtin_functions(TSRMLS_D) /* {{{ */
-{
-	return zend_register_functions(NULL, builtin_functions, NULL, MODULE_PERSISTENT TSRMLS_CC);
-}
+zend_module_entry zend_builtin_module = { /* {{{ */
+    STANDARD_MODULE_HEADER,
+	"Zend",
+	builtin_functions,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	ZEND_VERSION,
+	STANDARD_MODULE_PROPERTIES
+};
 /* }}} */
 
-void zend_shutdown_builtin_functions(TSRMLS_D) /* {{{ */
+int zend_startup_builtin_functions(TSRMLS_D) /* {{{ */
 {
-	zend_unregister_functions(builtin_functions, -1, NULL TSRMLS_CC);
+	return zend_register_internal_module(&zend_builtin_module TSRMLS_CC) == NULL ? FAILURE : SUCCESS;
 }
 /* }}} */
 
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_builtin_functions.h?r1=1.23&r2=1.24&diff_format=u
Index: ZendEngine2/zend_builtin_functions.h
diff -u ZendEngine2/zend_builtin_functions.h:1.23 ZendEngine2/zend_builtin_functions.h:1.24
--- ZendEngine2/zend_builtin_functions.h:1.23	Sun Aug 10 22:27:41 2008
+++ ZendEngine2/zend_builtin_functions.h	Tue Dec 30 18:17:28 2008
@@ -17,13 +17,12 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: zend_builtin_functions.h,v 1.23 2008/08/10 22:27:41 helly Exp $ */
+/* $Id: zend_builtin_functions.h,v 1.24 2008/12/30 18:17:28 helly Exp $ */
 
 #ifndef ZEND_BUILTIN_FUNCTIONS_H
 #define ZEND_BUILTIN_FUNCTIONS_H
 
 int zend_startup_builtin_functions(TSRMLS_D);
-void zend_shutdown_builtin_functions(TSRMLS_D);
 
 BEGIN_EXTERN_C()
 ZEND_API void zend_fetch_debug_backtrace(zval *return_value, int skip_last, int provide_object TSRMLS_DC);