diff options
| author | Remi Collet <fedora@famillecollet.com> | 2016-10-01 09:23:04 +0200 |
|---|---|---|
| committer | Remi Collet <fedora@famillecollet.com> | 2016-10-01 09:23:04 +0200 |
| commit | 0cda26d63776424506c214dda95eab3835a70295 (patch) | |
| tree | 1e8873bf9e8e18f63445e0eff9d4a1d03d269746 /sqlsrv-pr154.patch | |
| parent | 089518d762ff7c248d7e5d6a381ec8e692376991 (diff) | |
php-sqlsrv: 4.0.5
Diffstat (limited to 'sqlsrv-pr154.patch')
| -rw-r--r-- | sqlsrv-pr154.patch | 40 |
1 files changed, 0 insertions, 40 deletions
diff --git a/sqlsrv-pr154.patch b/sqlsrv-pr154.patch deleted file mode 100644 index ccab311..0000000 --- a/sqlsrv-pr154.patch +++ /dev/null @@ -1,40 +0,0 @@ -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 |