diff options
| author | Anatol Belski <ab@php.net> | 2015-03-23 00:07:43 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2015-03-23 00:07:43 +0100 |
| commit | 63d7cd7d5b9a8e94a0b6688ca21a0e7d3da9f132 (patch) | |
| tree | 7e46abcdcbf1c6e88fc2cffc47bf2303ffe5f143 | |
| parent | 7fce3607ea827d7e50bb4a8f0d1f1ecd71382c24 (diff) | |
| parent | a759c40872a7287a5bef0e54b068695404566c88 (diff) | |
| download | php-git-63d7cd7d5b9a8e94a0b6688ca21a0e7d3da9f132.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
cosmetic fix to default odbcver
Remove extraneous strlen() call
| -rw-r--r-- | ext/odbc/config.m4 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/odbc/config.m4 b/ext/odbc/config.m4 index 50ad6e7aae..01572922b5 100644 --- a/ext/odbc/config.m4 +++ b/ext/odbc/config.m4 @@ -500,7 +500,7 @@ if test "no" != "$PHP_ODBCVER"; then AC_DEFINE_UNQUOTED(ODBCVER, $PHP_ODBCVER, [ The highest supported ODBC version ]) fi else - AC_DEFINE(ODBCVER, 0x300, [ The highest supported ODBC version ]) + AC_DEFINE(ODBCVER, 0x0300, [ The highest supported ODBC version ]) fi |