Commit:    679fa1fc6854dce7d5d0ff7def65a5bbdbb18094
Author:    Ralf Lang <l...@b1-systems.de>         Mon, 22 Jul 2013 21:26:38 
+0200
Committer: Michael Wallner <m...@php.net>      Tue, 6 Aug 2013 22:51:58 +0200
Parents:   cb4c195f0b85ca5d91fee1ebe90105b8bb68356c
Branches:  master

Link:       
http://git.php.net/?p=php-src.git;a=commitdiff;h=679fa1fc6854dce7d5d0ff7def65a5bbdbb18094

Log:
make this work in vc11 too

Changed paths:
  M  main/SAPI.h
  M  main/rfc1867.c


Diff:
diff --git a/main/SAPI.h b/main/SAPI.h
index 6d5434d..6fc60c8 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 d3adf47..8460929 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)


--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to