Merge pull request #13 from weltling/master

Fix build with master
krakjoe · Aug 27, 2014 · 1627ee5 · 1627ee5
2 parents 574c90a + 40555c2
commit 1627ee5
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 7 deletions.
diff --git a/config.m4 b/config.m4
@@ -9,6 +9,7 @@ if test "$PHP_USTRING" != "no"; then
   PHP_SUBST(USTRING_SHARED_LIBADD)
 
   PHP_REQUIRE_CXX()
+  PHP_ADD_LIBRARY(stdc++,,USTRING_SHARED_LIBADD)
 
-  PHP_NEW_EXTENSION(ustring, ustring.cpp, $ext_shared)
+  PHP_NEW_EXTENSION(ustring, ustring.cpp, $ext_shared,, -D__STDC_LIMIT_MACROS)
 fi
diff --git a/config.w32 b/config.w32
@@ -4,11 +4,15 @@ ARG_WITH("ustring", "whether to enable ustring support, path to ICU", "yes");
 
 if (PHP_USTRING != "no") {
 	if (CHECK_LIB("icuuc.lib", "ustring", PHP_USTRING) &&
-					CHECK_HEADER_ADD_INCLUDE("unicode/utf.h", "CFLAGS_INTL")) {
+		CHECK_HEADER_ADD_INCLUDE("unicode/utf.h", "CFLAGS_USTRING")) {
+
+		EXTENSION("ustring", "ustring.cpp");
+
+		ADD_FLAG("LIBS_USTRING", "icudt.lib icuin.lib icuio.lib icule.lib iculx.lib icutu.lib icuuc.lib");
+		ADD_FLAG("CFLAGS_USTRING", "/EHsc /Zc:wchar_t /D__STDC_LIMIT_MACROS /DZEND_WIN32_FORCE_INLINE");
+
+		AC_DEFINE("HAVE_USTRING", 1, "Have ustring support");
+	} else {
+		WARNING("ustring not enabled; libraries and/or headers not found");
 	}
-	ADD_FLAG("LIBS_USTRING", "icudt.lib icuin.lib icuio.lib icule.lib iculx.lib icutu.lib icuuc.lib");
-	ADD_FLAG("CFLAGS_USTRING", "/EHsc /Zc:wchar_t");
-	var sources = "ustring.cpp";
-	AC_DEFINE("PHP_EXPORTS", 1);
-	EXTENSION("ustring", sources);
 }
diff --git a/ustring.cpp b/ustring.cpp
@@ -22,6 +22,10 @@
 #include "config.h"
 #endif
 
+#ifdef _WIN32
+#include "unicode/unistr.h"
+#endif
+
 extern "C" {
 #    include "php.h"
 #    include "php_ini.h"