Index: patches/platform.qnx.patch |
=================================================================== |
--- patches/platform.qnx.patch (revision 257503) |
+++ patches/platform.qnx.patch (working copy) |
@@ -1,7 +1,26 @@ |
-diff --git a/source/common/unicode/pandroid.h b/source/common/unicode/pqnx.h |
---- a/source/common/unicode/pandroid.h |
-+++ b/source/common/unicode/pqnx.h |
-@@ -45,8 +45,8 @@ |
+--- source/common/unicode/pqnx.h 2014-01-23 14:52:38.889798542 -0800 |
++++ source/common/unicode/pqnx.h 2014-03-18 11:24:27.335797876 -0700 |
+@@ -24,8 +24,8 @@ |
+ #define _PLATFORM_H |
+ |
+ /** |
+- * \file |
+- * \brief Basic types for the platform |
++ * \file |
++ * \brief Basic types for the platform |
+ */ |
+ |
+ /* This file should be included before uvernum.h. */ |
+@@ -34,7 +34,7 @@ |
+ #endif |
+ |
+ /** |
+- * Determine wheter to enable auto cleanup of libraries. |
++ * Determine wheter to enable auto cleanup of libraries. |
+ * @internal |
+ */ |
+ #ifndef UCLN_NO_AUTO_CLEANUP |
+@@ -45,13 +45,13 @@ |
#ifndef CYGWINMSVC |
/** Define the platform we're on. */ |
@@ -12,24 +31,83 @@ |
#endif |
/** |
-@@ -331,7 +331,7 @@ |
- # ifdef __cplusplus |
- # define U_INLINE inline |
- # else |
--# define U_INLINE inline |
-+# define U_INLINE __inline__ |
- # endif |
+ * \def U_HAVE_DIRENT_H |
+- * Define whether dirent.h is available |
++ * Define whether dirent.h is available |
+ * @internal |
+ */ |
+ #ifndef U_HAVE_DIRENT_H |
+@@ -147,7 +147,7 @@ |
#endif |
-diff --git a/source/common/unicode/ptypes.h b/source/common/unicode/ptypes.h |
---- a/source/common/unicode/ptypes.h |
-+++ b/source/common/unicode/ptypes.h |
-@@ -34,6 +34,8 @@ |
- # include "unicode/pfreebsd.h" |
- #elif defined(__OpenBSD__) |
- # include "unicode/popenbsd.h" |
-+#elif defined(__QNXNTO__) |
-+# include "unicode/pqnx.h" |
+ /* 1 or 0 to enable or disable threads. If undefined, default is: enable threads. */ |
+-#ifndef ICU_USE_THREADS |
++#ifndef ICU_USE_THREADS |
+ #define ICU_USE_THREADS 1 |
+ #endif |
+ |
+@@ -272,7 +272,7 @@ |
+ /*===========================================================================*/ |
+ |
+ #ifndef U_HAVE_NL_LANGINFO_CODESET |
+-#define U_HAVE_NL_LANGINFO_CODESET 1 |
++#define U_HAVE_NL_LANGINFO_CODESET 0 |
+ #endif |
+ |
+ #ifndef U_NL_LANGINFO_CODESET |
+@@ -282,8 +282,8 @@ |
+ #if 1 |
+ #define U_TZSET tzset |
+ #endif |
+-#if !defined(__UCLIBC__) |
+-#define U_TIMEZONE __timezone |
++#if 1 |
++#define U_TIMEZONE timezone |
+ #endif |
+ #if 1 |
+ #define U_TZNAME tzname |
+@@ -303,7 +303,7 @@ |
+ #elif 1 |
+ #define U_EXPORT __attribute__((visibility("default"))) |
+ #elif (defined(__SUNPRO_CC) && __SUNPRO_CC >= 0x550) \ |
+- || (defined(__SUNPRO_C) && __SUNPRO_C >= 0x550) |
++ || (defined(__SUNPRO_C) && __SUNPRO_C >= 0x550) |
+ #define U_EXPORT __global |
+ /*#elif defined(__HP_aCC) || defined(__HP_cc) |
+ #define U_EXPORT __declspec(dllexport)*/ |
+@@ -318,7 +318,7 @@ |
+ #if defined(U_CYGWIN) && !defined(__GNUC__) |
+ #define U_IMPORT __declspec(dllimport) |
#else |
- # include "unicode/platform.h" |
+-#define U_IMPORT |
++#define U_IMPORT |
#endif |
+ |
+ /* @} */ |
+@@ -336,7 +336,7 @@ |
+ #endif |
+ |
+ #ifndef U_ALIGN_CODE |
+-#define U_ALIGN_CODE(n) |
++#define U_ALIGN_CODE(n) |
+ #endif |
+ |
+ /** @} */ |
+@@ -379,7 +379,7 @@ |
+ * Define the library suffix with C syntax. |
+ * @internal |
+ */ |
+-# define U_LIB_SUFFIX_C_NAME |
++# define U_LIB_SUFFIX_C_NAME |
+ /** |
+ * Define the library suffix as a string with C syntax |
+ * @internal |
+@@ -394,7 +394,7 @@ |
+ #if U_HAVE_LIB_SUFFIX |
+ # ifndef U_ICU_ENTRY_POINT_RENAME |
+ /* Renaming pattern: u_strcpy_41_suffix */ |
+-# define U_ICU_ENTRY_POINT_RENAME(x) x ## _ ## 46 ## |
++# define U_ICU_ENTRY_POINT_RENAME(x) x ## _ ## 46 ## |
+ # define U_DEF_ICUDATA_ENTRY_POINT(major, minor) icudt####major##minor##_dat |
+ |
+ # endif |