[PHP-CVS] cvs: php-src /main main.c

[Felipe Pena]

felipe          Sat Feb 16 02:28:11 2008 UTC

  Modified files:              
    /php-src/main       main.c 
  Log:
  Fix build
  
http://cvs.php.net/viewvc.cgi/php-src/main/main.c?r1=1.758&r2=1.759&diff_format=u
Index: php-src/main/main.c
diff -u php-src/main/main.c:1.758 php-src/main/main.c:1.759
--- php-src/main/main.c:1.758   Fri Feb 15 15:09:56 2008
+++ php-src/main/main.c Sat Feb 16 02:28:11 2008
@@ -18,7 +18,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: main.c,v 1.758 2008/02/15 15:09:56 pajoye Exp $ */
+/* $Id: main.c,v 1.759 2008/02/16 02:28:11 felipe Exp $ */
 
 /* {{{ includes
  */
@@ -1743,17 +1743,6 @@
 /* {{{ php_module_startup
  */
 int php_module_startup(sapi_module_struct *sf, zend_module_entry 
*additional_modules, uint num_additional_modules)
-       REGISTER_MAIN_LONG_CONSTANT("PHP_MAJOR_VERSION", PHP_MAJOR_VERSION, 
CONST_PERSISTENT | CONST_CS);
-       REGISTER_MAIN_LONG_CONSTANT("PHP_MINOR_VERSION", PHP_MINOR_VERSION, 
CONST_PERSISTENT | CONST_CS);
-       REGISTER_MAIN_LONG_CONSTANT("PHP_RELEASE_VERSION", PHP_RELEASE_VERSION, 
CONST_PERSISTENT | CONST_CS);
-       REGISTER_MAIN_STRINGL_CONSTANT("PHP_EXTRA_VERSION", PHP_EXTRA_VERSION, 
sizeof(PHP_EXTRA_VERSION) - 1, CONST_PERSISTENT | CONST_CS);
-       REGISTER_MAIN_LONG_CONSTANT("PHP_VERSION_ID", PHP_VERSION_ID, 
CONST_PERSISTENT | CONST_CS);
-#ifdef ZTS
-       REGISTER_MAIN_LONG_CONSTANT("PHP_ZTS", 1, CONST_PERSISTENT | CONST_CS);
-#else
-       REGISTER_MAIN_LONG_CONSTANT("PHP_ZTS", 0, CONST_PERSISTENT | CONST_CS);
-#endif
-       REGISTER_MAIN_LONG_CONSTANT("PHP_DEBUG", PHP_DEBUG, CONST_PERSISTENT | 
CONST_CS);
 {
        zend_utility_functions zuf;
        zend_utility_values zuv;
@@ -1874,6 +1863,17 @@
        le_index_ptr = zend_register_list_destructors_ex(NULL, NULL, "index 
pointer", 0);
 
        /* Register constants */
+#ifdef ZTS
+       REGISTER_MAIN_LONG_CONSTANT("PHP_ZTS", 1, CONST_PERSISTENT | CONST_CS);
+#else
+       REGISTER_MAIN_LONG_CONSTANT("PHP_ZTS", 0, CONST_PERSISTENT | CONST_CS);
+#endif
+       REGISTER_MAIN_LONG_CONSTANT("PHP_MAJOR_VERSION", PHP_MAJOR_VERSION, 
CONST_PERSISTENT | CONST_CS);
+       REGISTER_MAIN_LONG_CONSTANT("PHP_MINOR_VERSION", PHP_MINOR_VERSION, 
CONST_PERSISTENT | CONST_CS);
+       REGISTER_MAIN_LONG_CONSTANT("PHP_RELEASE_VERSION", PHP_RELEASE_VERSION, 
CONST_PERSISTENT | CONST_CS);
+       REGISTER_MAIN_STRINGL_CONSTANT("PHP_EXTRA_VERSION", PHP_EXTRA_VERSION, 
sizeof(PHP_EXTRA_VERSION) - 1, CONST_PERSISTENT | CONST_CS);
+       REGISTER_MAIN_LONG_CONSTANT("PHP_VERSION_ID", PHP_VERSION_ID, 
CONST_PERSISTENT | CONST_CS);
+       REGISTER_MAIN_LONG_CONSTANT("PHP_DEBUG", PHP_DEBUG, CONST_PERSISTENT | 
CONST_CS);
        REGISTER_MAIN_STRINGL_CONSTANT("PHP_VERSION", PHP_VERSION, 
sizeof(PHP_VERSION)-1, CONST_PERSISTENT | CONST_CS);
        REGISTER_MAIN_STRINGL_CONSTANT("PHP_OS", php_os, strlen(php_os), 
CONST_PERSISTENT | CONST_CS);
        REGISTER_MAIN_STRINGL_CONSTANT("PHP_SAPI", sapi_module.name, 
strlen(sapi_module.name), CONST_PERSISTENT | CONST_CS);

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php