MFH

diff --git a/NEWS b/NEWS
index 81aac4703bb36e26eddd187c77302d94ed1367ff..eca3dcd6a05fc448dad1b56285ddc79d40509373 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -18,6 +18,7 @@ PHP                                                                        NEWS
 - Fixed bug #29340 (win32 build produces invalid php_ifx.dll). (Edin)
 - Fixed bug #29335 (fetch functions now use MYSQLI_BOTH as default) (Georg)
 - Fixed bug #29291 (get_class_vars() return names with NULLs). (Marcus)
+- Fixed bug #29264 (gettext extension not working). (Edin)
 - Fixed buf #29258 (variant_date_from_timestamp() does not honour
   timezone).  (Wez)
 - Fixed bug #29119 (html_entity_decode() misbehaves with UTF-8). (Moriyoshi)

diff --git a/ext/gettext/gettext.c b/ext/gettext/gettext.c
index 888baa384bd219f2ed11120f08ab39ec402e8600..e455b8536a73fec955107f87481eb08a7a679d64 100644 (file)
--- a/ext/gettext/gettext.c
+++ b/ext/gettext/gettext.c
@@ -27,7 +27,6 @@
 #if HAVE_LIBINTL
 
 #include <stdio.h>
-#include <libintl.h>
 #include "ext/standard/info.h"
 #include "php_gettext.h"
 
@@ -57,6 +56,8 @@ function_entry php_gettext_functions[] = {
 };
 /* }}} */
 
+#include <libintl.h>
+
 zend_module_entry php_gettext_module_entry = {
        STANDARD_MODULE_HEADER,
        "gettext",