garretts Thu, 30 Jul 2009 20:20:56 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=286569
Log: - Updated fix for bug #48911 (embed sapi misses SAPI_API) #- Windows didn't need SAPI_API Bug: http://bugs.php.net/48911 (Closed) 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-30 18:02:20 UTC (rev 286568) +++ php/php-src/branches/PHP_5_2/sapi/embed/php_embed.c 2009-07-30 20:20:56 UTC (rev 286569) @@ -107,7 +107,7 @@ return SUCCESS; } -extern SAPI_API sapi_module_struct php_embed_module = { +extern EMBED_SAPI_API sapi_module_struct php_embed_module = { "embed", /* name */ "PHP Embedded Library", /* pretty name */ @@ -139,7 +139,7 @@ }; /* }}} */ -SAPI_API int php_embed_init(int argc, char **argv PTSRMLS_DC) +EMBED_SAPI_API int php_embed_init(int argc, char **argv PTSRMLS_DC) { zend_llist global_vars; #ifdef ZTS @@ -202,7 +202,7 @@ return SUCCESS; } -SAPI_API void php_embed_shutdown(TSRMLS_D) +EMBED_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-30 18:02:20 UTC (rev 286568) +++ php/php-src/branches/PHP_5_2/sapi/embed/php_embed.h 2009-07-30 20:20:56 UTC (rev 286569) @@ -57,10 +57,16 @@ php_embed_shutdown(TSRMLS_C); \ } +#ifndef PHP_WIN32 + #define EMBED_SAPI_API SAPI_API +#else + #define EMBED_SAPI_API +#endif + BEGIN_EXTERN_C() -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; +EMBED_SAPI_API int php_embed_init(int argc, char **argv PTSRMLS_DC); +EMBED_SAPI_API void php_embed_shutdown(TSRMLS_D); +extern EMBED_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-30 18:02:20 UTC (rev 286568) +++ php/php-src/branches/PHP_5_3/sapi/embed/php_embed.c 2009-07-30 20:20:56 UTC (rev 286569) @@ -108,7 +108,7 @@ return SUCCESS; } -extern SAPI_API sapi_module_struct php_embed_module = { +extern EMBED_SAPI_API sapi_module_struct php_embed_module = { "embed", /* name */ "PHP Embedded Library", /* pretty name */ @@ -152,7 +152,7 @@ {NULL, NULL, NULL} }; -SAPI_API int php_embed_init(int argc, char **argv PTSRMLS_DC) +EMBED_SAPI_API int php_embed_init(int argc, char **argv PTSRMLS_DC) { zend_llist global_vars; #ifdef ZTS @@ -217,7 +217,7 @@ return SUCCESS; } -SAPI_API void php_embed_shutdown(TSRMLS_D) +EMBED_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-30 18:02:20 UTC (rev 286568) +++ php/php-src/branches/PHP_5_3/sapi/embed/php_embed.h 2009-07-30 20:20:56 UTC (rev 286569) @@ -57,10 +57,16 @@ php_embed_shutdown(TSRMLS_C); \ } +#ifndef PHP_WIN32 + #define EMBED_SAPI_API SAPI_API +#else + #define EMBED_SAPI_API +#endif + BEGIN_EXTERN_C() -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; +EMBED_SAPI_API int php_embed_init(int argc, char **argv PTSRMLS_DC); +EMBED_SAPI_API void php_embed_shutdown(TSRMLS_D); +extern EMBED_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-30 18:02:20 UTC (rev 286568) +++ php/php-src/trunk/sapi/embed/php_embed.c 2009-07-30 20:20:56 UTC (rev 286569) @@ -108,7 +108,7 @@ return SUCCESS; } -extern SAPI_API sapi_module_struct php_embed_module = { +extern EMBED_SAPI_API sapi_module_struct php_embed_module = { "embed", /* name */ "PHP Embedded Library", /* pretty name */ @@ -152,7 +152,7 @@ {NULL, NULL, NULL} }; -SAPI_API int php_embed_init(int argc, char **argv PTSRMLS_DC) +EMBED_SAPI_API int php_embed_init(int argc, char **argv PTSRMLS_DC) { zend_llist global_vars; #ifdef ZTS @@ -217,7 +217,7 @@ return SUCCESS; } -SAPI_API void php_embed_shutdown(TSRMLS_D) +EMBED_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-30 18:02:20 UTC (rev 286568) +++ php/php-src/trunk/sapi/embed/php_embed.h 2009-07-30 20:20:56 UTC (rev 286569) @@ -58,10 +58,16 @@ php_embed_shutdown(TSRMLS_C); \ } +#ifndef PHP_WIN32 + #define EMBED_SAPI_API SAPI_API +#else + #define EMBED_SAPI_API +#endif + BEGIN_EXTERN_C() -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; +EMBED_SAPI_API int php_embed_init(int argc, char **argv PTSRMLS_DC); +EMBED_SAPI_API void php_embed_shutdown(TSRMLS_D); +extern EMBED_SAPI_API sapi_module_struct php_embed_module; END_EXTERN_C()
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
