summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRalf Lang <lang@b1-systems.de>2013-07-22 21:26:38 +0200
committerMichael Wallner <mike@php.net>2013-08-06 22:51:58 +0200
commit679fa1fc6854dce7d5d0ff7def65a5bbdbb18094 (patch)
treeb17ff9e5cae30fc9fbb50e71526065f161fe9cd7
parentcb4c195f0b85ca5d91fee1ebe90105b8bb68356c (diff)
downloadphp-git-679fa1fc6854dce7d5d0ff7def65a5bbdbb18094.tar.gz
make this work in vc11 too
-rw-r--r--main/SAPI.h1
-rw-r--r--main/rfc1867.c4
2 files changed, 5 insertions, 0 deletions
diff --git a/main/SAPI.h b/main/SAPI.h
index 6d5434d141..6fc60c8865 100644
--- 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 d3adf47114..8460929108 100644
--- 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)