svn: /php/php-src/ branches/PHP_5_2/sapi/embed/php_embed.c branches/PHP_5_2/sapi/embed/php_embed.h branches/PHP_5_3/sapi/embed/php_embed.c
branches/PHP_5_3/sapi/embed/php_embed.h trunk/sapi/embed/php_embed.c trunk/sapi/embed/php_embed.h
| From: | Jani Taskinen | Date: | Tue, 28 Jul 2009 21:07:43 +0000 |
| Subject: | svn: /php/php-src/ branches/PHP_5_2/sapi/embed/php_embed.c branches/PHP_5_2/sapi/embed/php_embed.h branches/PHP_5_3/sapi/embed/php_embed.c branches/PHP_5_3/sapi/embed/php_embed.h trunk/sapi/embed/php_embed.c trunk/sapi/embed/php_embed.h |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-59883@lists.php.net to get a copy of this message | ||
jani Tue, 28 Jul 2009 21:07:43 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=286468
Log:
- Fixed bug #48911 (embed sapi misses SAPI_API)
Bug: http://bugs.php.net/48911 (Open) embed sapi misses
SAPI_API
Changed paths:
U php/php-src/branches/PHP_5_2/sapi/embed/php_embed.c
U php/php-src/branches/PHP_5_2/sapi/embed/php_embed.h
U php/php-src/branches/PHP_5_3/sapi/embed/php_embed.c
U php/php-src/branches/PHP_5_3/sapi/embed/php_embed.h
U php/php-src/trunk/sapi/embed/php_embed.c
U php/php-src/trunk/sapi/embed/php_embed.h
Modified: php/php-src/branches/PHP_5_2/sapi/embed/php_embed.c
===================================================================
--- php/php-src/branches/PHP_5_2/sapi/embed/php_embed.c 2009-07-28 20:48:15 UTC (rev 286467)
+++ php/php-src/branches/PHP_5_2/sapi/embed/php_embed.c 2009-07-28 21:07:43 UTC (rev 286468)
@@ -107,7 +107,7 @@
return SUCCESS;
}
-sapi_module_struct php_embed_module = {
+extern SAPI_API sapi_module_struct php_embed_module = {
"embed", /* name */
"PHP Embedded Library", /* pretty name */
@@ -139,7 +139,7 @@
};
/* }}} */
-int php_embed_init(int argc, char **argv PTSRMLS_DC)
+SAPI_API int php_embed_init(int argc, char **argv PTSRMLS_DC)
{
zend_llist global_vars;
#ifdef ZTS
@@ -202,7 +202,7 @@
return SUCCESS;
}
-void php_embed_shutdown(TSRMLS_D)
+SAPI_API void php_embed_shutdown(TSRMLS_D)
{
php_request_shutdown((void *) 0);
php_module_shutdown(TSRMLS_C);
Modified: php/php-src/branches/PHP_5_2/sapi/embed/php_embed.h
===================================================================
--- php/php-src/branches/PHP_5_2/sapi/embed/php_embed.h 2009-07-28 20:48:15 UTC (rev 286467)
+++ php/php-src/branches/PHP_5_2/sapi/embed/php_embed.h 2009-07-28 21:07:43 UTC (rev 286468)
@@ -58,9 +58,9 @@
}
BEGIN_EXTERN_C()
-int php_embed_init(int argc, char **argv PTSRMLS_DC);
-void php_embed_shutdown(TSRMLS_D);
-extern sapi_module_struct php_embed_module;
+SAPI_API int php_embed_init(int argc, char **argv PTSRMLS_DC);
+SAPI_API void php_embed_shutdown(TSRMLS_D);
+extern SAPI_API sapi_module_struct php_embed_module;
END_EXTERN_C()
Modified: php/php-src/branches/PHP_5_3/sapi/embed/php_embed.c
===================================================================
--- php/php-src/branches/PHP_5_3/sapi/embed/php_embed.c 2009-07-28 20:48:15 UTC (rev 286467)
+++ php/php-src/branches/PHP_5_3/sapi/embed/php_embed.c 2009-07-28 21:07:43 UTC (rev 286468)
@@ -108,7 +108,7 @@
return SUCCESS;
}
-sapi_module_struct php_embed_module = {
+extern SAPI_API sapi_module_struct php_embed_module = {
"embed", /* name */
"PHP Embedded Library", /* pretty name */
@@ -152,7 +152,7 @@
{NULL, NULL, NULL}
};
-int php_embed_init(int argc, char **argv PTSRMLS_DC)
+SAPI_API int php_embed_init(int argc, char **argv PTSRMLS_DC)
{
zend_llist global_vars;
#ifdef ZTS
@@ -217,7 +217,7 @@
return SUCCESS;
}
-void php_embed_shutdown(TSRMLS_D)
+SAPI_API void php_embed_shutdown(TSRMLS_D)
{
php_request_shutdown((void *) 0);
php_module_shutdown(TSRMLS_C);
Modified: php/php-src/branches/PHP_5_3/sapi/embed/php_embed.h
===================================================================
--- php/php-src/branches/PHP_5_3/sapi/embed/php_embed.h 2009-07-28 20:48:15 UTC (rev 286467)
+++ php/php-src/branches/PHP_5_3/sapi/embed/php_embed.h 2009-07-28 21:07:43 UTC (rev 286468)
@@ -58,9 +58,9 @@
}
BEGIN_EXTERN_C()
-int php_embed_init(int argc, char **argv PTSRMLS_DC);
-void php_embed_shutdown(TSRMLS_D);
-extern sapi_module_struct php_embed_module;
+SAPI_API int php_embed_init(int argc, char **argv PTSRMLS_DC);
+SAPI_API void php_embed_shutdown(TSRMLS_D);
+extern SAPI_API sapi_module_struct php_embed_module;
END_EXTERN_C()
Modified: php/php-src/trunk/sapi/embed/php_embed.c
===================================================================
--- php/php-src/trunk/sapi/embed/php_embed.c 2009-07-28 20:48:15 UTC (rev 286467)
+++ php/php-src/trunk/sapi/embed/php_embed.c 2009-07-28 21:07:43 UTC (rev 286468)
@@ -108,7 +108,7 @@
return SUCCESS;
}
-sapi_module_struct php_embed_module = {
+extern SAPI_API sapi_module_struct php_embed_module = {
"embed", /* name */
"PHP Embedded Library", /* pretty name */
@@ -152,7 +152,7 @@
{NULL, NULL, NULL}
};
-int php_embed_init(int argc, char **argv PTSRMLS_DC)
+SAPI_API int php_embed_init(int argc, char **argv PTSRMLS_DC)
{
zend_llist global_vars;
#ifdef ZTS
@@ -217,7 +217,7 @@
return SUCCESS;
}
-void php_embed_shutdown(TSRMLS_D)
+SAPI_API void php_embed_shutdown(TSRMLS_D)
{
php_request_shutdown((void *) 0);
php_module_shutdown(TSRMLS_C);
Modified: php/php-src/trunk/sapi/embed/php_embed.h
===================================================================
--- php/php-src/trunk/sapi/embed/php_embed.h 2009-07-28 20:48:15 UTC (rev 286467)
+++ php/php-src/trunk/sapi/embed/php_embed.h 2009-07-28 21:07:43 UTC (rev 286468)
@@ -59,9 +59,9 @@
}
BEGIN_EXTERN_C()
-int php_embed_init(int argc, char **argv PTSRMLS_DC);
-void php_embed_shutdown(TSRMLS_D);
-extern sapi_module_struct php_embed_module;
+SAPI_API int php_embed_init(int argc, char **argv PTSRMLS_DC);
+SAPI_API void php_embed_shutdown(TSRMLS_D);
+extern SAPI_API sapi_module_struct php_embed_module;
END_EXTERN_C()