diff options
| author | Anatol Belski <ab@php.net> | 2015-02-06 19:59:55 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2015-02-06 19:59:55 +0100 |
| commit | 464667153d7ca35ac9ffecdc4891f8a9469aebcb (patch) | |
| tree | 1571abf76fdd62eb038827ede774a05c77a4d6b8 | |
| parent | e6d16c095625c577be8091a7f368d0465c2b4644 (diff) | |
| parent | 9bf95d82911dc7028c624494e9ac914f615f66ed (diff) | |
| download | php-git-464667153d7ca35ac9ffecdc4891f8a9469aebcb.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
fix setting default ODBCVER value in config.w32
| -rw-r--r-- | ext/odbc/config.w32 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/odbc/config.w32 b/ext/odbc/config.w32 index 70a541f83b..9e969852c2 100644 --- a/ext/odbc/config.w32 +++ b/ext/odbc/config.w32 @@ -2,7 +2,7 @@ // vim:ft=javascript ARG_ENABLE("odbc", "ODBC support", "yes"); -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."); +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"); if (PHP_ODBC == "yes") { if (CHECK_LIB("odbc32.lib", "odbc") && CHECK_LIB("odbccp32.lib", "odbc") |