mike Wed, 02 Jun 2010 12:49:12 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=300090
Log:
fix cxx build
Changed paths:
U php/php-src/trunk/main/output.c
U php/php-src/trunk/main/php_output.h
Modified: php/php-src/trunk/main/output.c
===================================================================
--- php/php-src/trunk/main/output.c 2010-06-02 12:20:38 UTC (rev 300089)
+++ php/php-src/trunk/main/output.c 2010-06-02 12:49:12 UTC (rev 300090)
@@ -37,8 +37,8 @@
ZEND_DECLARE_MODULE_GLOBALS(output);
-PHPAPI const char php_output_default_handler_name[sizeof("default output
handler")] = "default output handler";
-PHPAPI const char php_output_devnull_handler_name[sizeof("null output
handler")] = "null output handler";
+const char php_output_default_handler_name[sizeof("default output handler")] =
"default output handler";
+const char php_output_devnull_handler_name[sizeof("null output handler")] =
"null output handler";
#if PHP_OUTPUT_NOINLINE || PHP_OUTPUT_DEBUG
# undef inline
Modified: php/php-src/trunk/main/php_output.h
===================================================================
--- php/php-src/trunk/main/php_output.h 2010-06-02 12:20:38 UTC (rev 300089)
+++ php/php-src/trunk/main/php_output.h 2010-06-02 12:49:12 UTC (rev 300090)
@@ -140,9 +140,6 @@
} func;
} php_output_handler;
-PHPAPI const char php_output_default_handler_name[sizeof("default output
handler")];
-PHPAPI const char php_output_devnull_handler_name[sizeof("null output
handler")];
-
ZEND_BEGIN_MODULE_GLOBALS(output)
int flags;
zend_stack *handlers;
@@ -177,6 +174,10 @@
BEGIN_EXTERN_C()
+
+extern const char php_output_default_handler_name[sizeof("default output
handler")];
+extern const char php_output_devnull_handler_name[sizeof("null output
handler")];
+
#define php_output_tearup() \
php_output_startup(); \
php_output_activate(TSRMLS_C)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
