From: foobar <sniper@php.net>
Date: Fri, 3 Aug 2001 05:07:22 +0000 (+0000)
Subject: These are redefined in the sqltypes.h that comes with unixODBC. PR: #12519
X-Git-Tag: PRE_ENGINE2_SPLIT~114
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=85e15deabe2746a3c7a280dd32a41af7b8827e8a;p=php

These are redefined in the sqltypes.h that comes with unixODBC. PR: #12519
---

diff --git a/ext/odbc/php_odbc.h b/ext/odbc/php_odbc.h
index cea272f08a..df599553bd 100644
--- a/ext/odbc/php_odbc.h
+++ b/ext/odbc/php_odbc.h
@@ -108,6 +108,14 @@ PHP_FUNCTION(solid_fetch_prev);
 
 #elif defined(HAVE_UNIXODBC) /* unixODBC library */
 
+#ifdef CHAR
+#undef CHAR
+#endif
+
+#ifdef SQLCHAR
+#undef SQLCHAR
+#endif
+
 #define ODBC_TYPE "unixODBC"
 #include <sql.h>
 #include <sqlext.h>