From f56d6b67b54f20b04a3382a7885ece8fb0705af1 Mon Sep 17 00:00:00 2001 From: Garrett Serack Date: Thu, 30 Jul 2009 20:20:56 +0000 Subject: [PATCH] - Updated fix for bug #48911 (embed sapi misses SAPI_API) #- Windows didn't need SAPI_API --- sapi/embed/php_embed.c | 6 +++--- sapi/embed/php_embed.h | 12 +++++++++--- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/sapi/embed/php_embed.c b/sapi/embed/php_embed.c index 62dc2ad0b6..e639df6825 100644 --- a/sapi/embed/php_embed.c +++ b/sapi/embed/php_embed.c @@ -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); diff --git a/sapi/embed/php_embed.h b/sapi/embed/php_embed.h index 7abf1c2029..9c5bdd0851 100644 --- a/sapi/embed/php_embed.h +++ b/sapi/embed/php_embed.h @@ -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() -- 2.40.0