Skip to content

Commit ace9632

Browse files
author
foobar
committed
Make this compile in ZTS mode.
1 parent 7a37f53 commit ace9632

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

ext/mcrypt/mcrypt.c

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1184,7 +1184,7 @@ PHP_FUNCTION(mcrypt_get_cipher_name)
11841184
/* }}} */
11851185

11861186

1187-
static void php_mcrypt_do_crypt (char* cipher, zval **key, zval **data, char *mode, zval **iv, int argc, int dencrypt, zval* return_value)
1187+
static void php_mcrypt_do_crypt (char* cipher, zval **key, zval **data, char *mode, zval **iv, int argc, int dencrypt, zval* return_value TSRMLS_DC)
11881188
{
11891189
char *cipher_dir_string;
11901190
char *module_dir_string;
@@ -1194,7 +1194,7 @@ static void php_mcrypt_do_crypt (char* cipher, zval **key, zval **data, char *mo
11941194
char *key_s = NULL, *iv_s;
11951195
char *data_s;
11961196
MCRYPT td;
1197-
1197+
11981198
MCRYPT_GET_INI
11991199

12001200
td = mcrypt_module_open (
@@ -1309,7 +1309,7 @@ PHP_FUNCTION(mcrypt_encrypt)
13091309

13101310
MCRYPT_CONVERT;
13111311

1312-
php_mcrypt_do_crypt (Z_STRVAL_PP(cipher), key, data, Z_STRVAL_PP(mode), iv, argc, MCRYPT_ENCRYPT, return_value);
1312+
php_mcrypt_do_crypt (Z_STRVAL_PP(cipher), key, data, Z_STRVAL_PP(mode), iv, argc, MCRYPT_ENCRYPT, return_value TSRMLS_CC);
13131313
}
13141314
/* }}} */
13151315

@@ -1327,7 +1327,7 @@ PHP_FUNCTION(mcrypt_decrypt)
13271327

13281328
MCRYPT_CONVERT;
13291329

1330-
php_mcrypt_do_crypt (Z_STRVAL_PP(cipher), key, data, Z_STRVAL_PP(mode), iv, argc, MCRYPT_DECRYPT, return_value);
1330+
php_mcrypt_do_crypt (Z_STRVAL_PP(cipher), key, data, Z_STRVAL_PP(mode), iv, argc, MCRYPT_DECRYPT, return_value TSRMLS_CC);
13311331
}
13321332
/* }}} */
13331333

@@ -1346,7 +1346,7 @@ PHP_FUNCTION(mcrypt_ecb)
13461346
MCRYPT_CONVERT_WO_MODE;
13471347
convert_to_long_ex(mode);
13481348

1349-
php_mcrypt_do_crypt (Z_STRVAL_PP(cipher), key, data, "ecb", iv, argc, Z_LVAL_PP(mode), return_value);
1349+
php_mcrypt_do_crypt (Z_STRVAL_PP(cipher), key, data, "ecb", iv, argc, Z_LVAL_PP(mode), return_value TSRMLS_CC);
13501350
}
13511351
/* }}} */
13521352

@@ -1365,7 +1365,7 @@ PHP_FUNCTION(mcrypt_cbc)
13651365
MCRYPT_CONVERT_WO_MODE;
13661366
convert_to_long_ex(mode);
13671367

1368-
php_mcrypt_do_crypt (Z_STRVAL_PP(cipher), key, data, "cbc", iv, argc, Z_LVAL_PP(mode), return_value);
1368+
php_mcrypt_do_crypt (Z_STRVAL_PP(cipher), key, data, "cbc", iv, argc, Z_LVAL_PP(mode), return_value TSRMLS_CC);
13691369
}
13701370
/* }}} */
13711371

@@ -1384,7 +1384,7 @@ PHP_FUNCTION(mcrypt_cfb)
13841384
MCRYPT_CONVERT_WO_MODE;
13851385
convert_to_long_ex(mode);
13861386

1387-
php_mcrypt_do_crypt (Z_STRVAL_PP(cipher), key, data, "cfb", iv, argc, Z_LVAL_PP(mode), return_value);
1387+
php_mcrypt_do_crypt (Z_STRVAL_PP(cipher), key, data, "cfb", iv, argc, Z_LVAL_PP(mode), return_value TSRMLS_CC);
13881388
}
13891389
/* }}} */
13901390

@@ -1403,7 +1403,7 @@ PHP_FUNCTION(mcrypt_ofb)
14031403
MCRYPT_CONVERT_WO_MODE;
14041404
convert_to_long_ex(mode);
14051405

1406-
php_mcrypt_do_crypt (Z_STRVAL_PP(cipher), key, data, "ofb", iv, argc, Z_LVAL_PP(mode), return_value);
1406+
php_mcrypt_do_crypt (Z_STRVAL_PP(cipher), key, data, "ofb", iv, argc, Z_LVAL_PP(mode), return_value TSRMLS_CC);
14071407
}
14081408
/* }}} */
14091409

0 commit comments

Comments
 (0)