com php-src: don't define tsrm ls in SAPIs under linux: sapi/apache2handler/sapi_apache2.c sapi/cgi/cgi_mai n.c sapi/cli/php_cli.c
| From: | Anatol Belski | Date: | Wed, 15 Oct 2014 14:55:47 +0000 |
| Subject: | com php-src: don't define tsrm ls in SAPIs under linux: sapi/apache2handler/sapi_apache2.c sapi/cgi/cgi_mai n.c sapi/cli/php_cli.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-82344@lists.php.net to get a copy of this message | ||
Commit: aff66a94a631b5711549395bb282f61b6f6f9e49
Author: Anatol Belski <ab@php.net> Wed, 15 Oct 2014 16:55:47 +0200
Parents: 8aeffdd74c826b5012c9b052848cfa8e593776ed
Branches: native-tls
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=aff66a94a631b5711549395bb282f61b6f6f9e49
Log:
don't define tsrm ls in SAPIs under linux
as it's compiled statically with the core
Changed paths:
M sapi/apache2handler/sapi_apache2.c
M sapi/cgi/cgi_main.c
M sapi/cli/php_cli.c
Diff:
diff --git a/sapi/apache2handler/sapi_apache2..c b/sapi/apache2handler/sapi_apache2.c
index 1234f91..3b93c74 100644
--- a/sapi/apache2handler/sapi_apache2.c
+++ b/sapi/apache2handler/sapi_apache2.c
@@ -71,7 +71,7 @@
/* A way to specify the location of the php.ini dir in an apache directive */
char *apache2_php_ini_path_override = NULL;
-#ifdef ZTS
+#if defined(PHP_WIN32) && defined(ZTS)
ZEND_TSRMLS_CACHE_DEFINE;
#endif
diff --git a/sapi/cgi/cgi_main.c b/sapi/cgi/cgi_main.c
index 426c3a7..10c7fbf 100644
--- a/sapi/cgi/cgi_main..c
+++ b/sapi/cgi/cgi_main.c
@@ -199,7 +199,9 @@ static void user_config_cache_entry_dtor(zval *el)
#ifdef ZTS
static int php_cgi_globals_id;
#define CGIG(v) ZEND_TSRMG(php_cgi_globals_id, php_cgi_globals_struct *, v)
+#if defined(PHP_WIN32)
ZEND_TSRMLS_CACHE_DEFINE;
+#endif
#else
static php_cgi_globals_struct php_cgi_globals;
#define CGIG(v) (php_cgi_globals.v)
diff --git a/sapi/cli/php_cli.c b/sapi/cli/php_cli.c
index f1dab46..723decf 100644
--- a/sapi/cli/php_cli.c
+++ b/sapi/cli/php_cli.c
@@ -99,7 +99,7 @@ PHPAPI extern char *php_ini_opened_path;
PHPAPI extern char *php_ini_scanned_path;
PHPAPI extern char *php_ini_scanned_files;
-#ifdef ZTS
+#if defined(PHP_WIN32) && defined(ZTS)
ZEND_TSRMLS_CACHE_DEFINE;
#endif