Merge branch 'PHP-8.0' into PHP-8.1

devnexen · devnexen · commit 2440d29efd20 · 2022-09-29T20:40:33.000+01:00
diff --git a/ext/standard/php_crypt_r.c b/ext/standard/php_crypt_r.c
@@ -47,14 +47,14 @@
 MUTEX_T php_crypt_extended_init_lock;
 #endif
 
-void php_init_crypt_r()
+void php_init_crypt_r(void)
 {
 #ifdef ZTS
 	php_crypt_extended_init_lock = tsrm_mutex_alloc();
 #endif
 }
 
-void php_shutdown_crypt_r()
+void php_shutdown_crypt_r(void)
 {
 #ifdef ZTS
 	tsrm_mutex_free(php_crypt_extended_init_lock);

Original file line number	Diff line number	Diff line change
`@@ -47,14 +47,14 @@`
`47`	`47`	`MUTEX_T php_crypt_extended_init_lock;`
`48`	`48`	`#endif`
`49`	`49`
`50`		`-void php_init_crypt_r()`
	`50`	`+void php_init_crypt_r(void)`
`51`	`51`	`{`
`52`	`52`	`#ifdef ZTS`
`53`	`53`	`php_crypt_extended_init_lock = tsrm_mutex_alloc();`
`54`	`54`	`#endif`
`55`	`55`	`}`
`56`	`56`
`57`		`-void php_shutdown_crypt_r()`
	`57`	`+void php_shutdown_crypt_r(void)`
`58`	`58`	`{`
`59`	`59`	`#ifdef ZTS`
`60`	`60`	`tsrm_mutex_free(php_crypt_extended_init_lock);`