--- ./source/common/unicode/platform.h.orig	Fri Mar 27 22:10:26 2015
+++ ./source/common/unicode/platform.h	Thu Jul 30 02:42:47 2015
@@ -285,8 +285,12 @@
 #       define U_HAVE_STDINT_H 0
 #   endif
 #elif U_PLATFORM == U_PF_SOLARIS
-    /* Solaris has inttypes.h but not stdint.h. */
-#   define U_HAVE_STDINT_H 0
+#	if defined(__SunOS_5_11) || defined(__SunOS_5_12)
+#	   define U_HAVE_STDINT_H 1
+#	else
+	    /* Solaris < 11 has inttypes.h but not stdint.h. */
+# 	  define U_HAVE_STDINT_H 0
+#	endif
 #elif U_PLATFORM == U_PF_AIX && !defined(_AIX51) && defined(_POWER)
     /* PPC AIX <= 4.3 has inttypes.h but not stdint.h. */
 #   define U_HAVE_STDINT_H 0
@@ -303,7 +307,7 @@
 #ifdef U_HAVE_INTTYPES_H
     /* Use the predefined value. */
 #elif U_PLATFORM == U_PF_SOLARIS
-    /* Solaris has inttypes.h but not stdint.h. */
+    /* Solaris < 11 has inttypes.h but not stdint.h. */
 #   define U_HAVE_INTTYPES_H 1
 #elif U_PLATFORM == U_PF_AIX && !defined(_AIX51) && defined(_POWER)
     /* PPC AIX <= 4.3 has inttypes.h but not stdint.h. */