From 2fe35cf8078cbb2da3e57200b007588988dbdd2a Mon Sep 17 00:00:00 2001
From: George Peter Banyard <girgias@php.net>
Date: Tue, 5 Apr 2022 13:35:59 +0100
Subject: [PATCH] Regenerate optimized func infos

Using the --generate-optimizer-info option for ./build/gen_stubs.php
---
 Zend/Optimizer/zend_func_infos.h | 14 +++++++-------
 ext/sodium/libsodium_arginfo.h   |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Zend/Optimizer/zend_func_infos.h b/Zend/Optimizer/zend_func_infos.h
index d0d54989dc7..ff89312fb3f 100644
--- a/Zend/Optimizer/zend_func_infos.h
+++ b/Zend/Optimizer/zend_func_infos.h
@@ -508,7 +508,7 @@ static const func_info_t func_infos[] = {
     F1("long2ip", MAY_BE_STRING|MAY_BE_FALSE),
     F1("getenv", MAY_BE_STRING|MAY_BE_ARRAY|MAY_BE_ARRAY_KEY_STRING|MAY_BE_ARRAY_OF_STRING|MAY_BE_FALSE),
     F1("getopt", MAY_BE_ARRAY|MAY_BE_ARRAY_KEY_LONG|MAY_BE_ARRAY_KEY_STRING|MAY_BE_ARRAY_OF_STRING|MAY_BE_ARRAY_OF_ARRAY|MAY_BE_ARRAY_OF_FALSE|MAY_BE_FALSE),
-#if HAVE_NANOSLEEP
+#if defined(HAVE_NANOSLEEP)
     F1("time_nanosleep", MAY_BE_ARRAY|MAY_BE_ARRAY_KEY_STRING|MAY_BE_ARRAY_OF_LONG|MAY_BE_BOOL),
 #endif
     F1("get_current_user", MAY_BE_STRING),
@@ -522,10 +522,10 @@ static const func_info_t func_infos[] = {
     F1("set_include_path", MAY_BE_STRING|MAY_BE_FALSE),
     F1("get_include_path", MAY_BE_STRING|MAY_BE_FALSE),
     F1("print_r", MAY_BE_STRING|MAY_BE_BOOL),
-#if HAVE_GETSERVBYPORT
+#if defined(HAVE_GETSERVBYPORT)
     F1("getservbyport", MAY_BE_STRING|MAY_BE_FALSE),
 #endif
-#if HAVE_GETPROTOBYNUMBER
+#if defined(HAVE_GETPROTOBYNUMBER)
     F1("getprotobynumber", MAY_BE_STRING|MAY_BE_FALSE),
 #endif
     F1("parse_ini_file", MAY_BE_ARRAY|MAY_BE_ARRAY_KEY_LONG|MAY_BE_ARRAY_KEY_STRING|MAY_BE_ARRAY_OF_FALSE|MAY_BE_ARRAY_OF_TRUE|MAY_BE_ARRAY_OF_LONG|MAY_BE_ARRAY_OF_DOUBLE|MAY_BE_ARRAY_OF_STRING|MAY_BE_ARRAY_OF_ARRAY|MAY_BE_ARRAY_OF_NULL|MAY_BE_FALSE),
@@ -538,7 +538,7 @@ static const func_info_t func_infos[] = {
 #endif
     F1("get_browser", MAY_BE_OBJECT|MAY_BE_ARRAY|MAY_BE_ARRAY_KEY_STRING|MAY_BE_ARRAY_OF_ANY|MAY_BE_FALSE),
     F1("crypt", MAY_BE_STRING),
-#if HAVE_STRPTIME
+#if defined(HAVE_STRPTIME)
     F1("strptime", MAY_BE_ARRAY|MAY_BE_ARRAY_KEY_STRING|MAY_BE_ARRAY_OF_LONG|MAY_BE_ARRAY_OF_STRING|MAY_BE_FALSE),
 #endif
 #if defined(HAVE_GETHOSTNAME)
@@ -547,7 +547,7 @@ static const func_info_t func_infos[] = {
     F1("gethostbyaddr", MAY_BE_STRING|MAY_BE_FALSE),
     F1("gethostbyname", MAY_BE_STRING),
     F1("gethostbynamel", MAY_BE_ARRAY|MAY_BE_ARRAY_KEY_LONG|MAY_BE_ARRAY_OF_STRING|MAY_BE_FALSE),
-#if defined(PHP_WIN32) || HAVE_DNS_SEARCH_FUNC
+#if defined(PHP_WIN32) || defined(HAVE_DNS_SEARCH_FUNC)
     F1("dns_get_record", MAY_BE_ARRAY|MAY_BE_ARRAY_KEY_LONG|MAY_BE_ARRAY_OF_ARRAY|MAY_BE_FALSE),
 #endif
     F1("md5", MAY_BE_STRING),
@@ -573,7 +573,7 @@ static const func_info_t func_infos[] = {
     F1("get_html_translation_table", MAY_BE_ARRAY|MAY_BE_ARRAY_KEY_STRING|MAY_BE_ARRAY_OF_STRING),
     F1("bin2hex", MAY_BE_STRING),
     F1("hex2bin", MAY_BE_STRING|MAY_BE_FALSE),
-#if HAVE_NL_LANGINFO
+#if defined(HAVE_NL_LANGINFO)
     F1("nl_langinfo", MAY_BE_STRING|MAY_BE_FALSE),
 #endif
     F1("wordwrap", MAY_BE_STRING),
@@ -701,7 +701,7 @@ static const func_info_t func_infos[] = {
     F1("stream_socket_server", MAY_BE_RESOURCE|MAY_BE_FALSE),
     F1("stream_socket_accept", MAY_BE_RESOURCE|MAY_BE_FALSE),
     F1("stream_socket_recvfrom", MAY_BE_STRING|MAY_BE_FALSE),
-#if HAVE_SOCKETPAIR
+#if defined(HAVE_SOCKETPAIR)
     F1("stream_socket_pair", MAY_BE_ARRAY|MAY_BE_ARRAY_KEY_LONG|MAY_BE_ARRAY_OF_RESOURCE|MAY_BE_FALSE),
 #endif
     F1("stream_get_contents", MAY_BE_STRING|MAY_BE_FALSE),
diff --git a/ext/sodium/libsodium_arginfo.h b/ext/sodium/libsodium_arginfo.h
index a45bd5f59ea..a7351c9bef1 100644
--- a/ext/sodium/libsodium_arginfo.h
+++ b/ext/sodium/libsodium_arginfo.h
@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: e172b900040a9d9ac98207c638fdeb3a0c6a13e6 */
+ * Stub hash: 7ccd5115d292690c0cfcfeeb2ff5adf7ac7a616a */
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_sodium_crypto_aead_aes256gcm_is_available, 0, 0, _IS_BOOL, 0)
 ZEND_END_ARG_INFO()