blob: 6373cdccdf08759a3af242f2424b3e011150a279 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
|
Index: source/common/normalizer2impl.h
===================================================================
--- source/common/normalizer2impl.h (revision 73520)
+++ source/common/normalizer2impl.h (working copy)
@@ -31,7 +31,7 @@
U_NAMESPACE_BEGIN
-class CanonIterData;
+struct CanonIterData;
class Hangul {
public:
Index: source/common/locmap.c
===================================================================
--- source/common/locmap.c (revision 73520)
+++ source/common/locmap.c (working copy)
@@ -30,9 +30,11 @@
#include "cstring.h"
#include "cmemory.h"
+#if 0
#if defined(U_WINDOWS) && defined(_MSC_VER) && (_MSC_VER >= 1500)
#define USE_WINDOWS_LOCALE_API
#endif
+#endif
#ifdef USE_WINDOWS_LOCALE_API
#include <windows.h>
Index: source/common/putil.c
===================================================================
--- source/common/putil.c (revision 73520)
+++ source/common/putil.c (working copy)
@@ -2159,7 +2159,7 @@
if(U_FAILURE(*status)) return NULL;
- lib = LoadLibrary(libName);
+ lib = LoadLibraryA(libName);
if(lib==NULL) {
*status = U_MISSING_RESOURCE_ERROR;
Index: source/i18n/zstrfmt.h
===================================================================
--- source/i18n/zstrfmt.h (revision 73520)
+++ source/i18n/zstrfmt.h (working copy)
@@ -80,7 +80,7 @@
* ZSFStringPool Pool of (UChar *) strings. Provides for sharing of repeated
* strings within ZoneStringFormats.
*/
-class ZSFStringPoolChunk;
+struct ZSFStringPoolChunk;
class ZSFStringPool: public UMemory {
public:
ZSFStringPool(UErrorCode &status);
Index: source/i18n/fmtable.cpp
===================================================================
--- source/i18n/fmtable.cpp (revision 73520)
+++ source/i18n/fmtable.cpp (working copy)
@@ -199,6 +199,9 @@
// -------------------------------------
// copy constructor
+#ifdef U_WINODWS
+#pragram warning(disable: 4996)
+#endif
Formattable::Formattable(const Formattable &source)
: UObject(*this)
|
