make this work in vc11 too

diff --git a/main/SAPI.h b/main/SAPI.h
index 6d5434d141b5472107e97f3244372952fbbc08ec..6fc60c886513e71ce36b2e13caceb17be557d817 100644 (file)
--- a/main/SAPI.h
+++ b/main/SAPI.h
@@ -27,6 +27,7 @@
 #include "zend_operators.h"
 #ifdef PHP_WIN32
 #include "win95nt.h"
+#include "win32/php_stdint.h"
 #endif
 #include <sys/stat.h>
 

diff --git a/main/rfc1867.c b/main/rfc1867.c
index d3adf4711407fdc520b4aeb84ed927eca03c4627..8460929108e10adc79b425a5c3f04fc0bf5bcf6d 100644 (file)
--- a/main/rfc1867.c
+++ b/main/rfc1867.c
@@ -34,6 +34,10 @@
 #include "rfc1867.h"
 #include "ext/standard/php_string.h"
 
+#if defined(_MSC_VER)
+# define atoll(s) _atoi64(s)
+#endif
+
 #define DEBUG_FILE_UPLOAD ZEND_DEBUG
 
 static int dummy_encoding_translation(TSRMLS_D)