From: Thomas Punt <tpunt@hotmail.co.uk>
Date: Wed, 18 Jan 2017 09:57:27 +0000 (+0000)
Subject: Remove more TSRMLS_CC macros
X-Git-Tag: php-7.1.2RC1~55
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9977bdf9b3bd235899c980edda12315ad6fa1338;p=php

Remove more TSRMLS_CC macros
---

diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c
index cb34077362..9aec7f9d3a 100644
--- a/ext/openssl/openssl.c
+++ b/ext/openssl/openssl.c
@@ -1180,7 +1180,7 @@ static int php_openssl_parse_config(struct php_x509_request * req, zval * option
 		&& Z_TYPE_P(item) == IS_STRING) {
 		req->curve_name = OBJ_sn2nid(Z_STRVAL_P(item));
 		if (req->curve_name == NID_undef) {
-			php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown elliptic curve (short) name %s", Z_STRVAL_P(item));
+			php_error_docref(NULL, E_WARNING, "Unknown elliptic curve (short) name %s", Z_STRVAL_P(item));
 			return FAILURE;
 		}
 	}
@@ -3917,7 +3917,7 @@ static EVP_PKEY * php_openssl_generate_private_key(struct php_x509_request * req
 			case OPENSSL_KEYTYPE_EC:
 				{
 					if (req->curve_name == NID_undef) {
-						php_error_docref(NULL TSRMLS_CC, E_WARNING, "Missing configuration value: 'curve_name' not set");
+						php_error_docref(NULL, E_WARNING, "Missing configuration value: 'curve_name' not set");
 						return NULL;
 					}
 					EC_KEY *eckey = EC_KEY_new_by_curve_name(req->curve_name);