iliaa           Sun May 30 13:57:37 2004 EDT

  Modified files:              (Branch: PHP_4_3)
    /php-src    NEWS 
    /php-src/ext/informix       Makefile.frag ifx.ec 
  Log:
  MFH: Fixed bug #28564 (Problem building informix as a shared extension).
  
  
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.668&r2=1.1247.2.669&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.668 php-src/NEWS:1.1247.2.669
--- php-src/NEWS:1.1247.2.668   Tue May 25 09:02:53 2004
+++ php-src/NEWS        Sun May 30 13:57:36 2004
@@ -1,6 +1,8 @@
 PHP 4                                                                      NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 ?? Jun 2004, Version 4.3.7
+- Fixed bug #28564 (Problem building informix as a shared extension). 
+  (roques at mti dot ag, Ilia)
 
 25 May 2004, Version 4.3.7RC1
 - Upgraded bundled GD library to 2.0.23. (Ilia)
http://cvs.php.net/diff.php/php-src/ext/informix/Makefile.frag?r1=1.2&r2=1.2.4.1&ty=u
Index: php-src/ext/informix/Makefile.frag
diff -u php-src/ext/informix/Makefile.frag:1.2 
php-src/ext/informix/Makefile.frag:1.2.4.1
--- php-src/ext/informix/Makefile.frag:1.2      Thu Jun 13 20:01:41 2002
+++ php-src/ext/informix/Makefile.frag  Sun May 30 13:57:36 2004
@@ -1,7 +1,10 @@
+OVERALL_TARGET += $(srcdir)/ifx.c
 
 $(srcdir)/ifx.c: $(srcdir)/ifx.ec $(builddir)/libphpifx.a
        (if test -d $(INFORMIXDIR); then \
           THREADLIB=POSIX $(INFORMIXDIR)/bin/esql -e $(IFX_ESQL_FLAGS) 
$(srcdir)/ifx.ec; mv ifx.c $@; \
+          THREADLIB=POSIX $(INFORMIXDIR)/bin/esql -e $(IFX_ESQL_FLAGS) 
$(srcdir)/ifx.ec; \
+           mv ifx.c $@ || true; \
         else \
           touch $@; \
         fi)
http://cvs.php.net/diff.php/php-src/ext/informix/ifx.ec?r1=1.69.2.22&r2=1.69.2.23&ty=u
Index: php-src/ext/informix/ifx.ec
diff -u php-src/ext/informix/ifx.ec:1.69.2.22 php-src/ext/informix/ifx.ec:1.69.2.23
--- php-src/ext/informix/ifx.ec:1.69.2.22       Sun Nov  2 18:14:06 2003
+++ php-src/ext/informix/ifx.ec Sun May 30 13:57:36 2004
@@ -21,7 +21,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: ifx.ec,v 1.69.2.22 2003/11/02 23:14:06 edink Exp $ */
+/* $Id: ifx.ec,v 1.69.2.23 2004/05/30 17:57:36 iliaa Exp $ */
 
 /* -------------------------------------------------------------------
  * if you want a function reference : "grep '^\*\*' ifx.ec" will give
@@ -36,6 +36,10 @@
 
 /* prevent mod_ssl.h's header file from being included. */
 #define AP_HOOK_H
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include "php.h"
 #include "php_globals.h"

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

Reply via email to