• Home
  • Line#
  • Scopes#
  • Navigate#
  • Raw
  • Download
1--- a/icu4c/source/common/unicode/uconfig.h
2+++ b/icu4c/source/common/unicode/uconfig.h
3@@ -55,6 +55,11 @@
4 #include "uconfig_local.h"
5 #endif
6
7+// Tensorflow is statically linked on all platforms.
8+#ifndef U_STATIC_IMPLEMENTATION
9+#define U_STATIC_IMPLEMENTATION
10+#endif
11+
12 /**
13  * \def U_DEBUG
14  * Determines whether to include debugging code.
15--- a/icu4c/source/common/udata.cpp
16+++ b/icu4c/source/common/udata.cpp
17@@ -18,11 +18,10 @@
18
19 #include "unicode/utypes.h"  /* U_PLATFORM etc. */
20
21-#ifdef __GNUC__
22-/* if gcc
23-#define ATTRIBUTE_WEAK __attribute__ ((weak))
24-might have to #include some other header
25-*/
26+#if defined(__GNUC__) || defined(__SUNPRO_CC)
27+#  define ATTRIBUTE_WEAK __attribute__ ((weak))
28+#else
29+#  define ATTRIBUTE_WEAK
30 #endif
31
32 #include "unicode/putil.h"
33@@ -649,10 +648,9 @@
34  * partial-data-library access functions where each returns a pointer
35  * to its data package, if it is linked in.
36  */
37-/*
38-extern const void *uprv_getICUData_collation(void) ATTRIBUTE_WEAK;
39-extern const void *uprv_getICUData_conversion(void) ATTRIBUTE_WEAK;
40-*/
41+U_CDECL_BEGIN
42+const void *uprv_getICUData_conversion(void) ATTRIBUTE_WEAK;
43+U_CDECL_END
44
45 /*----------------------------------------------------------------------*
46  *                                                                      *
47@@ -710,10 +708,11 @@
48         if (uprv_getICUData_collation) {
49             setCommonICUDataPointer(uprv_getICUData_collation(), FALSE, pErrorCode);
50         }
51+        */
52         if (uprv_getICUData_conversion) {
53             setCommonICUDataPointer(uprv_getICUData_conversion(), FALSE, pErrorCode);
54         }
55-        */
56+
57 #if U_PLATFORM_HAS_WINUWP_API == 0 // Windows UWP Platform does not support dll icu data at this time
58         setCommonICUDataPointer(&U_ICUDATA_ENTRY_POINT, FALSE, pErrorCode);
59         {
60