svn: /php/php-src/ branches/PHP_5_3/win32/winutil.c branches/PHP_5_4/win32/winutil.c trunk/win32/winutil.c
| From: | Pierre Joye | Date: | Thu, 16 Jun 2011 10:20:25 +0000 |
| Subject: | svn: /php/php-src/ branches/PHP_5_3/win32/winutil.c branches/PHP_5_4/win32/winutil.c trunk/win32/winutil.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-65232@lists.php.net to get a copy of this message | ||
pajoye Thu, 16 Jun 2011 10:20:25 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=312203
Log:
- fix nts build
Changed paths:
U php/php-src/branches/PHP_5_3/win32/winutil.c
U php/php-src/branches/PHP_5_4/win32/winutil.c
U php/php-src/trunk/win32/winutil.c
Modified: php/php-src/branches/PHP_5_3/win32/winutil.c
===================================================================
--- php/php-src/branches/PHP_5_3/win32/winutil.c 2011-06-16 01:41:34 UTC (rev 312202)
+++ php/php-src/branches/PHP_5_3/win32/winutil.c 2011-06-16 10:20:25 UTC (rev 312203)
@@ -82,7 +82,10 @@
BOOL ret;
size_t i = 0;
+#ifdef ZTS
tsrm_mutex_lock(php_lock_win32_cryptoctx);
+#endif
+
if (has_crypto_ctx == 0) {
if (!CryptAcquireContext(&hCryptProv, NULL, NULL, PROV_RSA_FULL, CRYPT_MACHINE_KEYSET)) {
/* Could mean that the key container does not exist, let try
@@ -96,7 +99,10 @@
}
}
}
+
+#ifdef ZTS
tsrm_mutex_unlock(php_lock_win32_cryptoctx);
+#endif
if (has_crypto_ctx == 0) {
return FAILURE;
Modified: php/php-src/branches/PHP_5_4/win32/winutil.c
===================================================================
--- php/php-src/branches/PHP_5_4/win32/winutil.c 2011-06-16 01:41:34 UTC (rev 312202)
+++ php/php-src/branches/PHP_5_4/win32/winutil.c 2011-06-16 10:20:25 UTC (rev 312203)
@@ -82,7 +82,10 @@
BOOL ret;
size_t i = 0;
+#ifdef ZTS
tsrm_mutex_lock(php_lock_win32_cryptoctx);
+#endif
+
if (has_crypto_ctx == 0) {
if (!CryptAcquireContext(&hCryptProv, NULL, NULL, PROV_RSA_FULL, CRYPT_MACHINE_KEYSET)) {
/* Could mean that the key container does not exist, let try
@@ -96,7 +99,10 @@
}
}
}
+
+#ifdef ZTS
tsrm_mutex_unlock(php_lock_win32_cryptoctx);
+#endif
if (has_crypto_ctx == 0) {
return FAILURE;
Modified: php/php-src/trunk/win32/winutil.c
===================================================================
--- php/php-src/trunk/win32/winutil.c 2011-06-16 01:41:34 UTC (rev 312202)
+++ php/php-src/trunk/win32/winutil.c 2011-06-16 10:20:25 UTC (rev 312203)
@@ -82,7 +82,10 @@
BOOL ret;
size_t i = 0;
+#ifdef ZTS
tsrm_mutex_lock(php_lock_win32_cryptoctx);
+#endif
+
if (has_crypto_ctx == 0) {
if (!CryptAcquireContext(&hCryptProv, NULL, NULL, PROV_RSA_FULL, CRYPT_MACHINE_KEYSET)) {
/* Could mean that the key container does not exist, let try
@@ -96,7 +99,10 @@
}
}
}
+
+#ifdef ZTS
tsrm_mutex_unlock(php_lock_win32_cryptoctx);
+#endif
if (has_crypto_ctx == 0) {
return FAILURE;