cvs: php4 /ext/odbc php_odbc.h
| From: | Jani Taskinen | Date: | Fri, 03 Aug 2001 05:07:22 +0000 |
| Subject: | cvs: php4 /ext/odbc php_odbc.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-6499@lists.php.net to get a copy of this message | ||
sniper Fri Aug 3 01:07:22 2001 EDT
Modified files:
/php4/ext/odbc php_odbc.h
Log:
These are redefined in the sqltypes.h that comes with unixODBC. PR: #12519
Index: php4/ext/odbc/php_odbc.h
diff -u php4/ext/odbc/php_odbc.h:1.41 php4/ext/odbc/php_odbc.h:1.42
--- php4/ext/odbc/php_odbc.h:1.41 Mon Jul 30 04:24:31 2001
+++ php4/ext/odbc/php_odbc.h Fri Aug 3 01:07:22 2001
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_odbc.h,v 1.41 2001/07/30 08:24:31 zeev Exp $ */
+/* $Id: php_odbc.h,v 1.42 2001/08/03 05:07:22 sniper Exp $ */
#ifndef PHP_ODBC_H
#define PHP_ODBC_H
@@ -107,6 +107,14 @@
#endif
#elif defined(HAVE_UNIXODBC) /* unixODBC library */
+
+#ifdef CHAR
+#undef CHAR
+#endif
+
+#ifdef SQLCHAR
+#undef SQLCHAR
+#endif
#define ODBC_TYPE "unixODBC"
#include <sql.h>