clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-21 18:07:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

- Updated fix for bug #48911 (embed sapi misses SAPI_API)

Browse Source 
#- Windows didn't need SAPI_API
This commit is contained in:
Garrett Serack 2009-07-30 20:20:56 +00:00
parent f8ee7db001
commit f56d6b67b5
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sapi/embed/php_embed.c
View File

@ -108,7 +108,7 @@ static int php_embed_startup(sapi_module_struct *sapi_module)
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 @@ static const zend_function_entry additional_functions[] = {
{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 @@ SAPI_API int php_embed_init(int argc, char **argv PTSRMLS_DC)
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);

12
sapi/embed/php_embed.h
View File

@ -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()