edink           Thu Jul 29 17:12:42 2004 EDT

  Modified files:              (Branch: PHP_5_0)
    /php-src    NEWS 
    /php-src/ext/informix       config.w32 
  Log:
  MFH: Fix informix compilation on Windows (bug #29340)
  
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.15&r2=1.1760.2.16&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1760.2.15 php-src/NEWS:1.1760.2.16
--- php-src/NEWS:1.1760.2.15    Wed Jul 28 20:35:11 2004
+++ php-src/NEWS        Thu Jul 29 17:12:41 2004
@@ -15,6 +15,7 @@
   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
http://cvs.php.net/diff.php/php-src/ext/informix/config.w32?r1=1.1&r2=1.1.2.1&ty=u
Index: php-src/ext/informix/config.w32
diff -u php-src/ext/informix/config.w32:1.1 php-src/ext/informix/config.w32:1.1.2.1
--- php-src/ext/informix/config.w32:1.1 Fri Jan  9 10:11:31 2004
+++ php-src/ext/informix/config.w32     Thu Jul 29 17:12:41 2004
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.1 2004/01/09 15:11:31 wez Exp $
+// $Id: config.w32,v 1.1.2.1 2004/07/29 21:12:41 edink Exp $
 // vim:ft=javascript
 
 ARG_WITH("informix", "informix support", "no");
@@ -17,7 +17,7 @@
 
                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%");

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to