com php-src: Increase ODBCVER to 3.5 by default: ext/odbc/config.m4 ext/odbc/config.w32
| From: | Anatol Belski | Date: | Mon, 04 Jul 2016 14:48:59 +0000 |
| Subject: | com php-src: Increase ODBCVER to 3.5 by default: ext/odbc/config.m4 ext/odbc/config.w32 | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-92764@lists.php.net to get a copy of this message | ||
Commit: 4b9362d347143eb0d23229427b98e62504a8c64e
Author: Anatol Belski <ab@php.net> Mon, 4 Jul 2016 16:48:59 +0200
Parents: 421cc65510cead9c554f87e83edd0f903a733969
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=4b9362d347143eb0d23229427b98e62504a8c64e
Log:
Increase ODBCVER to 3.5 by default
Changed paths:
M ext/odbc/config.m4
M ext/odbc/config.w32
Diff:
diff --git a/ext/odbc/config.m4 b/ext/odbc/config.m4
index 5aa7efa..ecee15f 100644
--- a/ext/odbc/config.m4
+++ b/ext/odbc/config.m4
@@ -101,8 +101,8 @@ dnl configure options
dnl
PHP_ARG_WITH(odbcver,,
-[ --with-odbcver[=HEX] Force support for the passed ODBC version. A hex number is expected,
default 0x0300.
- Use the special value of 0 to prevent an explicit ODBCVER to be
defined. ], 0x0300)
+[ --with-odbcver[=HEX] Force support for the passed ODBC version. A hex number is expected,
default 0x0350.
+ Use the special value of 0 to prevent an explicit ODBCVER to be
defined. ], 0x0350)
if test -z "$ODBC_TYPE"; then
PHP_ARG_WITH(adabas,,
diff --git a/ext/odbc/config.w32 b/ext/odbc/config.w32
index 3c238c6..b710ccd 100644
--- a/ext/odbc/config.w32
+++ b/ext/odbc/config.w32
@@ -2,7 +2,7 @@
// vim:ft=javascript
ARG_ENABLE("odbc", "ODBC support", "no");
-ARG_WITH("odbcver", "Force support for the passed ODBC version. A hex number is
expected, default 0x0300. Use the special value of 0 to prevent an explicit ODBCVER to be
defined.", "0x0300");
+ARG_WITH("odbcver", "Force support for the passed ODBC version. A hex number is
expected, default 0x0350. Use the special value of 0 to prevent an explicit ODBCVER to be
defined.", "0x0350");
if (PHP_ODBC == "yes") {
if (CHECK_LIB("odbc32.lib", "odbc") &&
CHECK_LIB("odbccp32.lib", "odbc")