diff options
| author | Pierre Joye <pajoye@php.net> | 2010-05-03 19:51:59 +0000 |
|---|---|---|
| committer | Pierre Joye <pajoye@php.net> | 2010-05-03 19:51:59 +0000 |
| commit | 56e327ba27f4af62ea9f077ae0f5b91c37d9157a (patch) | |
| tree | 09648086668c7fcde63f7927af95e7d799a12f0a /sapi/apache2handler/sapi_apache2.c | |
| parent | 5ca71c00f52419b7cc0526755d0924b849259fc7 (diff) | |
| download | php-git-56e327ba27f4af62ea9f077ae0f5b91c37d9157a.tar.gz | |
- revert fix for #51723 in 5.2, vc6 does not support strtoi64, use builtin functioon in 5.3 (trunk is vc9+ only)
Diffstat (limited to 'sapi/apache2handler/sapi_apache2.c')
| -rw-r--r-- | sapi/apache2handler/sapi_apache2.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/sapi/apache2handler/sapi_apache2.c b/sapi/apache2handler/sapi_apache2.c index 24e489d722..8d0c94ec93 100644 --- a/sapi/apache2handler/sapi_apache2.c +++ b/sapi/apache2handler/sapi_apache2.c @@ -53,6 +53,10 @@ #include "php_apache.h" +#if _MSC_VER <= 1300 +# include "win32/php_strtoi64.h" +#endif + /* UnixWare and Netware define shutdown to _shutdown, which causes problems later * on when using a structure member named shutdown. Since this source * file does not use the system call shutdown, it is safe to #undef it.K @@ -120,7 +124,7 @@ php_apache_sapi_header_handler(sapi_header_struct *sapi_header, sapi_header_op_e } ctx->content_type = estrdup(val); } else if (!strcasecmp(sapi_header->header, "content-length")) { -#ifdef PHP_WINDOWS +#ifdef PHP_WIN32 # ifdef APR_HAS_LARGE_FILES ap_set_content_length(ctx->r, (apr_off_t) _strtoui64(val, (char **)NULL, 10)); # else |