diff options
| author | Jakub Zelenka <bukka@php.net> | 2015-01-12 09:02:17 +0000 |
|---|---|---|
| committer | Jakub Zelenka <bukka@php.net> | 2015-01-12 09:02:17 +0000 |
| commit | b3823f5cab4e405b767cd8dddebb54b1c29bd2a8 (patch) | |
| tree | e42fbf615d62213c1e744b8a909155e8f2cdaa87 /sapi/embed/php_embed.h | |
| parent | e6fb493e5dbafdad37ba5334c986636342b5d9aa (diff) | |
| parent | 31817447cc06093368f022086340ad3f6f616528 (diff) | |
| download | php-git-b3823f5cab4e405b767cd8dddebb54b1c29bd2a8.tar.gz | |
Merge branch 'master' into jsond
Conflicts:
ext/json/JSON_parser.c
ext/json/JSON_parser.h
ext/json/json.c
ext/json/utf8_decode.c
Diffstat (limited to 'sapi/embed/php_embed.h')
| -rw-r--r-- | sapi/embed/php_embed.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sapi/embed/php_embed.h b/sapi/embed/php_embed.h index 82afa686d2..982daa8756 100644 --- a/sapi/embed/php_embed.h +++ b/sapi/embed/php_embed.h @@ -41,14 +41,14 @@ #ifndef PHP_WIN32 #define EMBED_SAPI_API SAPI_API #else - #define EMBED_SAPI_API -#endif + #define EMBED_SAPI_API +#endif #ifdef ZTS ZEND_TSRMLS_CACHE_EXTERN; #endif -BEGIN_EXTERN_C() +BEGIN_EXTERN_C() EMBED_SAPI_API int php_embed_init(int argc, char **argv); EMBED_SAPI_API void php_embed_shutdown(void); extern EMBED_SAPI_API sapi_module_struct php_embed_module; |