diff options
| author | Anatol Belski <ab@php.net> | 2015-02-06 19:05:43 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2015-02-06 19:05:43 +0100 |
| commit | d0319e60b94f0016a2c516f5e0f199f445360cba (patch) | |
| tree | 253484e871e31214d47fc0223169e1b37f008850 /ext/odbc/php_odbc_includes.h | |
| parent | e033af4ed6a811f0710acaba166a4924cda7f73e (diff) | |
| parent | e46e208819f4ce18390d77131f79b5b498d59bb7 (diff) | |
| download | php-git-d0319e60b94f0016a2c516f5e0f199f445360cba.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
Fixed bug #68964 Allowed memory size exhausted with odbc_exec
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 */ |