Permalink
Browse files

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fixed build
  NEWS for bug #63893

Conflicts:
	NEWS
  • Loading branch information...
2 parents dba22c0 + 9498cf6 commit 18e160411e364ee02eff12e8ab516be9911be393 @weltling weltling committed Jan 15, 2013
Showing with 5 additions and 1 deletion.
  1. +5 −1 ext/standard/string.c
View
@@ -23,7 +23,11 @@
/* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */
#include <stdio.h>
-#include <stdint.h>
+#ifdef PHP_WIN32
+# include "win32/php_stdint.h"
+#else
+# include <stdint.h>
+#endif
#include "php.h"
#include "php_rand.h"
#include "php_string.h"

0 comments on commit 18e1604

Please sign in to comment.