diff options
| author | Jakub Zelenka <bukka@php.net> | 2015-02-08 14:08:31 +0000 |
|---|---|---|
| committer | Jakub Zelenka <bukka@php.net> | 2015-02-08 14:08:31 +0000 |
| commit | f2825042b4dd9aa941a080c027f15f41c1b9e4bc (patch) | |
| tree | 2e7d97c1dfd4aeabb506ffdd206a612b82adea8d /ext/odbc/php_odbc_includes.h | |
| parent | 0a81f9a0bd36deac8707949acbcf92f612b60e8e (diff) | |
| parent | ce9f52adcdfb19f70dc4274f3587e58ac07995bd (diff) | |
| download | php-git-f2825042b4dd9aa941a080c027f15f41c1b9e4bc.tar.gz | |
Merge branch 'master' into jsond
Conflicts:
ext/json/json.c
Diffstat (limited to 'ext/odbc/php_odbc_includes.h')
| -rw-r--r-- | ext/odbc/php_odbc_includes.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/ext/odbc/php_odbc_includes.h b/ext/odbc/php_odbc_includes.h index 99dd457670..44bc7a3444 100644 --- a/ext/odbc/php_odbc_includes.h +++ b/ext/odbc/php_odbc_includes.h @@ -25,12 +25,6 @@ #if HAVE_UODBC -#define ODBCVER 0x0250 -/*#ifndef MSVC5 -#define FAR -#endif -*/ - /* checking in the same order as in configure.in */ #if defined(HAVE_SOLID) || defined(HAVE_SOLID_30) || defined(HAVE_SOLID_35) /* Solid Server */ |