MFH: Fix informix compilation on Windows (bug #29340)

diff --git a/NEWS b/NEWS
index d21b25c38965f634e53649d444c982b3aaf6d5c2..81aac4703bb36e26eddd187c77302d94ed1367ff 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -15,6 +15,7 @@ PHP                                                                        NEWS
   the constructor). (Marcus)
 - Fixed bug #29342 (strtotime() does not handle empty date string properly).
   (Ilia)
+- 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 buf #29258 (variant_date_from_timestamp() does not honour

diff --git a/ext/informix/config.w32 b/ext/informix/config.w32
index b59918c4b46a78158af2d9ab33615e778ba13b37..c01d3567a05ff51c392bc43da9ab7fb12b347cec 100644 (file)
--- a/ext/informix/config.w32
+++ b/ext/informix/config.w32
@@ -17,7 +17,7 @@ if (PHP_INFORMIX != "no") {
 
                ADD_FLAG("CFLAGS_INFORMIX", "/I " + php_ifx_dir + "\\incl\\esql "); 
 
-               EXTENSION('informix', 'ifx.c', null, "/D IFX_VERSION=921 /D HAVE_IFX_IUS=1", "php_ifx.dll");
+               EXTENSION('informix', 'ifx.c', null, "/D IFX_VERSION=921 /D HAVE_IFX_IUS=1 /D HAVE_IFX=1", "php_ifx.dll");
                MFO.WriteLine(configure_module_dirname + "\\ifx.c: " + configure_module_dirname + "\\ifx.ec");
                MFO.WriteLine("\t<<informix_build.bat");
                MFO.WriteLine("PATH " + php_ifx_bin + ";%PATH%");