From: Pierre Joye <pajoye@php.net>
Date: Mon, 3 May 2010 19:51:59 +0000 (+0000)
Subject: - revert fix for #51723 in 5.2, vc6 does not support strtoi64, use builtin functioon... 
X-Git-Tag: php-5.4.0alpha1~191^2~1571
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=56e327ba27f4af62ea9f077ae0f5b91c37d9157a;p=php

- revert fix for #51723 in 5.2, vc6 does not support strtoi64, use builtin functioon in 5.3 (trunk is vc9+ only)
---

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