blob: ccab311fa91ef08791c78c4cfee8182a397b73b1 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
|
From 9082b42b45f9bb926189aba875a8a62c54bfb1b8 Mon Sep 17 00:00:00 2001
From: Remi Collet <fedora@famillecollet.com>
Date: Fri, 16 Sep 2016 15:31:23 +0200
Subject: [PATCH] ensure correct ODBCVER is used
---
source/pdo_sqlsrv/xplat.h | 4 ++++
source/sqlsrv/xplat.h | 4 ++++
2 files changed, 8 insertions(+)
diff --git a/source/pdo_sqlsrv/xplat.h b/source/pdo_sqlsrv/xplat.h
index bede13c..3408f00 100644
--- a/source/pdo_sqlsrv/xplat.h
+++ b/source/pdo_sqlsrv/xplat.h
@@ -228,6 +228,10 @@ typedef windowsULongLong_t ULONGLONG;
#define UNIXODBC
#endif
+/* can be defined in php sources */
+#ifdef ODBCVER
+#undef ODBCVER
+#endif
// Build the mplat driver as an ODBC 3.8 driver, so that all of the
// source code shared with Windows SNAC (which is ODBC 3.8) compiles.
#define ODBCVER 0x0380
diff --git a/source/sqlsrv/xplat.h b/source/sqlsrv/xplat.h
index bede13c..3408f00 100644
--- a/source/sqlsrv/xplat.h
+++ b/source/sqlsrv/xplat.h
@@ -228,6 +228,10 @@ typedef windowsULongLong_t ULONGLONG;
#define UNIXODBC
#endif
+/* can be defined in php sources */
+#ifdef ODBCVER
+#undef ODBCVER
+#endif
// Build the mplat driver as an ODBC 3.8 driver, so that all of the
// source code shared with Windows SNAC (which is ODBC 3.8) compiles.
#define ODBCVER 0x0380
|
