- Fixed bug #15803 (and propably others related too)

  . Changed the compile so that it doesn't "pollute" the INCLUDES
    anymore and thus cause trouble with other extensions which
    might use the same header files. (e.g. ODBC)
  . Some fixes for Informix compile problems (with the new build system)
  . Removed unnecessary stub.c file.

1 files changed, 87 insertions, 0 deletions

diff --git a/ext/informix/php_informix_includes.h b/ext/informix/php_informix_includes.h
new file mode 100644
index 0000000000..5c1d9aae85
--- /dev/null
+++ b/ext/informix/php_informix_includes.h
@@ -0,0 +1,87 @@
+/* 
+   +----------------------------------------------------------------------+
+   | PHP Version 4                                                        |
+   +----------------------------------------------------------------------+
+   | Copyright (c) 1997-2002 The PHP Group                                |
+   +----------------------------------------------------------------------+
+   | This source file is subject to version 2.02 of the PHP license,      |
+   | that is bundled with this package in the file LICENSE, and is        |
+   | available at through the world-wide-web at                           |
+   | http://www.php.net/license/2_02.txt.                                 |
+   | If you did not receive a copy of the PHP license and are unable to   |
+   | obtain it through the world-wide-web, please send a note to          |
+   | license@php.net so we can mail you a copy immediately.               |
+   +----------------------------------------------------------------------+
+   | Authors: Danny Heijl <Danny.Heijl@cevi.be>, initial cut (ODS 7)      |
+   |          Christian Cartus <chc@idgruppe.de>, blobs, and IUS 9        |
+   |          Jouni Ahto <jouni.ahto@exdec.fi>, configuration stuff       |
+   | based on mysql code by: Zeev Suraski <zeev@php.net>                  |
+   +----------------------------------------------------------------------+
+*/
+
+/* $Id$ */
+
+#ifndef PHP_INFORMIX_INCLUDES_H
+#define PHP_INFORMIX_INCLUDES_H
+
+#if HAVE_IFX                        /* with Informix */
+
+#undef TYPEMAX
+#undef CHAR
+
+#include "locator.h"
+#include "sqltypes.h"
+
+#define MAX_RESID          64
+#define BLOBINFILE 0      /* 0=in memory, 1=in file */
+
+/* query result set data */
+typedef struct ifx_res {
+	char connecid[16];
+	char cursorid[16];
+	char descrpid[16];
+	char statemid[16];
+	int  isscroll;
+	int  ishold;
+	int  iscursory;
+	int  paramquery;
+	int  numcols;
+	int  rowid;
+	int  affected_rows;
+	long sqlerrd[6];
+	int res_id[MAX_RESID];
+} IFX_RES;
+
+typedef struct _IFX_IDRES {
+	int type;
+	union {
+		struct {
+			int mode;
+			loc_t blob_data;
+		} BLOBRES;
+
+		struct {
+			char *char_data;
+			int len;
+		} CHARRES;
+
+#if HAVE_IFX_IUS
+		struct {
+			ifx_lo_t slob_data;
+			ifx_lo_create_spec_t *createspec;
+			int lofd;
+		} SLOBRES;
+#endif
+	} DATARES;
+} IFX_IDRES;
+
+#define BLOB DATARES.BLOBRES
+#define CHAR DATARES.CHARRES
+
+#if HAVE_IFX_IUS
+#define SLOB DATARES.SLOBRES
+#endif
+
+#endif /* HAVE_IFX */
+
+#endif /* PHP_INFORMIX_INCLUDES_H */