diff options
| author | Michael Wallner <mike@php.net> | 2013-08-09 11:47:25 +0200 |
|---|---|---|
| committer | Michael Wallner <mike@php.net> | 2013-08-09 11:47:25 +0200 |
| commit | 611122c22ea809a128e2cbb07e0160e141ac492d (patch) | |
| tree | 41173105742ebc177de9ee439d7e0e2d5393d267 /ext/oci8 | |
| parent | 5acdcbc0bc49767cd76b1ba4c1cf34814ccffdc9 (diff) | |
| parent | 4a9d7c1f001a558ab0ebddb74e3b81d8d58b8095 (diff) | |
| download | php-git-611122c22ea809a128e2cbb07e0160e141ac492d.tar.gz | |
Merge branch '2Guploads'
* 2Guploads:
add NEWS entry; add simple test
more precise condition
make this work in vc11 too
Use int64_t and atoll() after discussion with johannes
ws
Patch for https://bugs.php.net/bug.php?id=44522 to allow uploading files above 2G.
unify stdint type usage
Diffstat (limited to 'ext/oci8')
| -rw-r--r-- | ext/oci8/oci8.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/ext/oci8/oci8.c b/ext/oci8/oci8.c index cd1b0a0860..ad00c02d72 100644 --- a/ext/oci8/oci8.c +++ b/ext/oci8/oci8.c @@ -12,7 +12,7 @@ | obtain it through the world-wide-web, please send a note to | | license@php.net so we can mail you a copy immediately. | +----------------------------------------------------------------------+ - | Authors: Stig Sæther Bakken <ssb@php.net> | + | Authors: Stig S�ther Bakken <ssb@php.net> | | Thies C. Arntzen <thies@thieso.net> | | Maxim Maletsky <maxim@maxim.cx> | | | @@ -37,13 +37,6 @@ #include "php_ini.h" #include "ext/standard/php_smart_str.h" -#ifdef HAVE_STDINT_H -#include <stdint.h> -#endif -#ifdef PHP_WIN32 -#include "win32/php_stdint.h" -#endif - #if HAVE_OCI8 #if PHP_MAJOR_VERSION > 5 |