Fix [-Wundef] warning in GetText extension

diff --git a/ext/gettext/gettext.c b/ext/gettext/gettext.c
index 7e6b95f5fca58db111e0546e81575d615e23c6d2..66d67e62293f4c5353c09f114117003f7c56b1fc 100644 (file)
--- a/ext/gettext/gettext.c
+++ b/ext/gettext/gettext.c
@@ -20,7 +20,7 @@
 
 #include "php.h"
 
-#if HAVE_LIBINTL
+#ifdef HAVE_LIBINTL
 
 #include <stdio.h>
 #include "ext/standard/info.h"
@@ -197,7 +197,7 @@ PHP_FUNCTION(bindtextdomain)
 }
 /* }}} */
 
-#if HAVE_NGETTEXT
+#ifdef HAVE_NGETTEXT
 /* {{{ proto string ngettext(string MSGID1, string MSGID2, int N)
    Plural version of gettext() */
 PHP_FUNCTION(ngettext)
@@ -221,7 +221,7 @@ PHP_FUNCTION(ngettext)
 /* }}} */
 #endif
 
-#if HAVE_DNGETTEXT
+#ifdef HAVE_DNGETTEXT
 /* {{{ proto string dngettext(string domain, string msgid1, string msgid2, int count)
    Plural version of dgettext() */
 PHP_FUNCTION(dngettext)
@@ -247,7 +247,7 @@ PHP_FUNCTION(dngettext)
 /* }}} */
 #endif
 
-#if HAVE_DCNGETTEXT
+#ifdef HAVE_DCNGETTEXT
 /* {{{ proto string dcngettext(string domain, string msgid1, string msgid2, int n, int category)
    Plural version of dcgettext() */
 PHP_FUNCTION(dcngettext)
@@ -275,7 +275,7 @@ PHP_FUNCTION(dcngettext)
 /* }}} */
 #endif
 
-#if HAVE_BIND_TEXTDOMAIN_CODESET
+#ifdef HAVE_BIND_TEXTDOMAIN_CODESET
 
 /* {{{ proto string bind_textdomain_codeset(string domain, string codeset)
    Specify the character encoding in which the messages from the DOMAIN message catalog will be returned. */

diff --git a/ext/gettext/gettext.stub.php b/ext/gettext/gettext.stub.php
index 71c7712001cfb961c3c237b448f940d1f7015bad..6dfb388d596cfe771027a79d2ac9cc93af793dc4 100644 (file)
--- a/ext/gettext/gettext.stub.php
+++ b/ext/gettext/gettext.stub.php
@@ -15,18 +15,18 @@ function dcgettext(string $domain_name, string $msgid, int $category): string|fa
 
 function bindtextdomain(string $domain_name, string $dir): string|false {}
 
-#if HAVE_NGETTEXT
+#ifdef HAVE_NGETTEXT
 function ngettext(string $msgid1, string $msgid2, int $n): string|false {}
 #endif
 
-#if HAVE_DNGETTEXT
+#ifdef HAVE_DNGETTEXT
 function dngettext(string $domain, string $msgid1, string $msgid2, int $count): string|false {}
 #endif
 
-#if HAVE_DCNGETTEXT
+#ifdef HAVE_DCNGETTEXT
 function dcngettext(string $domain, string $msgid1, string $msgid2, int $count, int $category): string|false {}
 #endif
 
-#if HAVE_BIND_TEXTDOMAIN_CODESET
+#ifdef HAVE_BIND_TEXTDOMAIN_CODESET
 function bind_textdomain_codeset(string $domain, string $codeset): string|false {}
 #endif

diff --git a/ext/gettext/gettext_arginfo.h b/ext/gettext/gettext_arginfo.h
index 03933da2f6389e021d02308d1d70cc37d6c8a92b..c36f178d1d317aa7d6b14e2e901e10d9434d82b6 100644 (file)
--- a/ext/gettext/gettext_arginfo.h
+++ b/ext/gettext/gettext_arginfo.h
@@ -26,7 +26,7 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_bindtextdomain, 0, 2, MAY_BE_STR
        ZEND_ARG_TYPE_INFO(0, dir, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
-#if HAVE_NGETTEXT
+#if defined(HAVE_NGETTEXT)
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_ngettext, 0, 3, MAY_BE_STRING|MAY_BE_FALSE)
        ZEND_ARG_TYPE_INFO(0, msgid1, IS_STRING, 0)
        ZEND_ARG_TYPE_INFO(0, msgid2, IS_STRING, 0)
@@ -34,7 +34,7 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_ngettext, 0, 3, MAY_BE_STRING|MA
 ZEND_END_ARG_INFO()
 #endif
 
-#if HAVE_DNGETTEXT
+#if defined(HAVE_DNGETTEXT)
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_dngettext, 0, 4, MAY_BE_STRING|MAY_BE_FALSE)
        ZEND_ARG_TYPE_INFO(0, domain, IS_STRING, 0)
        ZEND_ARG_TYPE_INFO(0, msgid1, IS_STRING, 0)
@@ -43,7 +43,7 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_dngettext, 0, 4, MAY_BE_STRING|M
 ZEND_END_ARG_INFO()
 #endif
 
-#if HAVE_DCNGETTEXT
+#if defined(HAVE_DCNGETTEXT)
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_dcngettext, 0, 5, MAY_BE_STRING|MAY_BE_FALSE)
        ZEND_ARG_TYPE_INFO(0, domain, IS_STRING, 0)
        ZEND_ARG_TYPE_INFO(0, msgid1, IS_STRING, 0)
@@ -53,7 +53,7 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_dcngettext, 0, 5, MAY_BE_STRING|
 ZEND_END_ARG_INFO()
 #endif
 
-#if HAVE_BIND_TEXTDOMAIN_CODESET
+#if defined(HAVE_BIND_TEXTDOMAIN_CODESET)
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_bind_textdomain_codeset, 0, 2, MAY_BE_STRING|MAY_BE_FALSE)
        ZEND_ARG_TYPE_INFO(0, domain, IS_STRING, 0)
        ZEND_ARG_TYPE_INFO(0, codeset, IS_STRING, 0)
@@ -66,16 +66,16 @@ ZEND_FUNCTION(gettext);
 ZEND_FUNCTION(dgettext);
 ZEND_FUNCTION(dcgettext);
 ZEND_FUNCTION(bindtextdomain);
-#if HAVE_NGETTEXT
+#if defined(HAVE_NGETTEXT)
 ZEND_FUNCTION(ngettext);
 #endif
-#if HAVE_DNGETTEXT
+#if defined(HAVE_DNGETTEXT)
 ZEND_FUNCTION(dngettext);
 #endif
-#if HAVE_DCNGETTEXT
+#if defined(HAVE_DCNGETTEXT)
 ZEND_FUNCTION(dcngettext);
 #endif
-#if HAVE_BIND_TEXTDOMAIN_CODESET
+#if defined(HAVE_BIND_TEXTDOMAIN_CODESET)
 ZEND_FUNCTION(bind_textdomain_codeset);
 #endif
 
@@ -87,16 +87,16 @@ static const zend_function_entry ext_functions[] = {
        ZEND_FE(dgettext, arginfo_dgettext)
        ZEND_FE(dcgettext, arginfo_dcgettext)
        ZEND_FE(bindtextdomain, arginfo_bindtextdomain)
-#if HAVE_NGETTEXT
+#if defined(HAVE_NGETTEXT)
        ZEND_FE(ngettext, arginfo_ngettext)
 #endif
-#if HAVE_DNGETTEXT
+#if defined(HAVE_DNGETTEXT)
        ZEND_FE(dngettext, arginfo_dngettext)
 #endif
-#if HAVE_DCNGETTEXT
+#if defined(HAVE_DCNGETTEXT)
        ZEND_FE(dcngettext, arginfo_dcngettext)
 #endif
-#if HAVE_BIND_TEXTDOMAIN_CODESET
+#if defined(HAVE_BIND_TEXTDOMAIN_CODESET)
        ZEND_FE(bind_textdomain_codeset, arginfo_bind_textdomain_codeset)
 #endif
        ZEND_FE_END

diff --git a/ext/gettext/php_gettext.h b/ext/gettext/php_gettext.h
index 647d8bffa68df5bda57f922b0b280524dbc61afa..8bee52c679500ee6e23923da4fca2ced4122cea2 100644 (file)
--- a/ext/gettext/php_gettext.h
+++ b/ext/gettext/php_gettext.h
@@ -17,7 +17,7 @@
 #ifndef PHP_GETTEXT_H
 #define PHP_GETTEXT_H
 
-#if HAVE_LIBINTL
+#ifdef HAVE_LIBINTL
 
 extern zend_module_entry php_gettext_module_entry;
 #define gettext_module_ptr &php_gettext_module_entry