HaikuPorts
  • Login
  • Preferences
  • Help/Guide
  • Wiki
  • Timeline
  • Roadmap
  • View Tickets
  • Search
  • Port Log
  • Blog

Context Navigation

  • Back to Ticket #377

Ticket #377: icu-4.4.1-haiku.diff

File icu-4.4.1-haiku.diff, 13.1 KB (added by pulkomandy, 5 years ago)

Patch to icu 4.4.1 to build under haiku/gcc2

Line 
1diff -Naur Vanilla44/source/common/normalizer2.cpp 4.4.1/source/common/normalizer2.cpp
2--- Vanilla44/source/common/normalizer2.cpp     2010-04-28 17:27:38.048496640 +0200
3+++ 4.4.1/source/common/normalizer2.cpp 2010-07-13 19:54:36.869793792 +0200
4@@ -221,7 +221,7 @@
5               ReorderingBuffer &buffer, UErrorCode &errorCode) const {
6         impl.decompose(src, limit, &buffer, errorCode);
7     }
8-    using Normalizer2WithImpl::normalize;  // Avoid warning about hiding base class function.
9+//    using Normalizer2WithImpl::normalize;  // Avoid warning about hiding base class function.
10     virtual void
11     normalizeAndAppend(const UChar *src, const UChar *limit, UBool doNormalize,
12                        ReorderingBuffer &buffer, UErrorCode &errorCode) const {
13@@ -231,7 +231,7 @@
14     spanQuickCheckYes(const UChar *src, const UChar *limit, UErrorCode &errorCode) const {
15         return impl.decompose(src, limit, NULL, errorCode);
16     }
17-    using Normalizer2WithImpl::spanQuickCheckYes;  // Avoid warning about hiding base class function.
18+//    using Normalizer2WithImpl::spanQuickCheckYes;  // Avoid warning about hiding base class function.
19     virtual UNormalizationCheckResult getQuickCheck(UChar32 c) const {
20         return impl.isDecompYes(impl.getNorm16(c)) ? UNORM_YES : UNORM_NO;
21     }
22@@ -251,7 +251,7 @@
23               ReorderingBuffer &buffer, UErrorCode &errorCode) const {
24         impl.compose(src, limit, onlyContiguous, TRUE, buffer, errorCode);
25     }
26-    using Normalizer2WithImpl::normalize;  // Avoid warning about hiding base class function.
27+//    using Normalizer2WithImpl::normalize;  // Avoid warning about hiding base class function.
28     virtual void
29     normalizeAndAppend(const UChar *src, const UChar *limit, UBool doNormalize,
30                        ReorderingBuffer &buffer, UErrorCode &errorCode) const {
31@@ -293,7 +293,7 @@
32     spanQuickCheckYes(const UChar *src, const UChar *limit, UErrorCode &) const {
33         return impl.composeQuickCheck(src, limit, onlyContiguous, NULL);
34     }
35-    using Normalizer2WithImpl::spanQuickCheckYes;  // Avoid warning about hiding base class function.
36+//    using Normalizer2WithImpl::spanQuickCheckYes;  // Avoid warning about hiding base class function.
37     virtual UNormalizationCheckResult getQuickCheck(UChar32 c) const {
38         return impl.getCompQuickCheck(impl.getNorm16(c));
39     }
40@@ -320,7 +320,7 @@
41               ReorderingBuffer &buffer, UErrorCode &errorCode) const {
42         impl.makeFCD(src, limit, &buffer, errorCode);
43     }
44-    using Normalizer2WithImpl::normalize;  // Avoid warning about hiding base class function.
45+//    using Normalizer2WithImpl::normalize;  // Avoid warning about hiding base class function.
46     virtual void
47     normalizeAndAppend(const UChar *src, const UChar *limit, UBool doNormalize,
48                        ReorderingBuffer &buffer, UErrorCode &errorCode) const {
49@@ -330,7 +330,7 @@
50     spanQuickCheckYes(const UChar *src, const UChar *limit, UErrorCode &errorCode) const {
51         return impl.makeFCD(src, limit, NULL, errorCode);
52     }
53-    using Normalizer2WithImpl::spanQuickCheckYes;  // Avoid warning about hiding base class function.
54+//    using Normalizer2WithImpl::spanQuickCheckYes;  // Avoid warning about hiding base class function.
55     virtual UBool hasBoundaryBefore(UChar32 c) const { return impl.hasFCDBoundaryBefore(c); }
56     virtual UBool hasBoundaryAfter(UChar32 c) const { return impl.hasFCDBoundaryAfter(c); }
57     virtual UBool isInert(UChar32 c) const { return impl.isFCDInert(c); }
58diff -Naur Vanilla44/source/i18n/currfmt.h 4.4.1/source/i18n/currfmt.h
59--- Vanilla44/source/i18n/currfmt.h     2010-04-28 17:27:08.008388608 +0200
60+++ 4.4.1/source/i18n/currfmt.h 2010-07-13 21:14:07.276299776 +0200
61@@ -63,7 +63,7 @@
62     virtual Format* clone() const;
63 
64 
65-    using MeasureFormat::format;
66+    // using MeasureFormat::format;
67 
68     /**
69      * Override Format API.
70diff -Naur Vanilla44/source/i18n/digitlst.cpp 4.4.1/source/i18n/digitlst.cpp
71--- Vanilla44/source/i18n/digitlst.cpp  2010-04-28 17:27:10.030146560 +0200
72+++ 4.4.1/source/i18n/digitlst.cpp      2010-07-13 21:11:17.399769600 +0200
73@@ -36,7 +36,7 @@
74 #include <limits.h>
75 #include <string.h>
76 #include <stdio.h>
77-#include <limits>
78+// #include <limits>
79 
80 // ***************************************************************************
81 // class DigitList
82@@ -399,11 +399,13 @@
83             nonConstThis->fDouble /= -1;
84         }
85     } else if (isInfinite()) {
86+               /*
87         if (std::numeric_limits<double>::has_infinity) {
88             nonConstThis->fDouble = std::numeric_limits<double>::infinity();
89         } else {
90             nonConstThis->fDouble = std::numeric_limits<double>::max();
91-        }
92+        }*/
93+        nonConstThis->fDouble = DBL_MAX;
94         if (!isPositive()) {
95             nonConstThis->fDouble = -fDouble;
96         }
97diff -Naur Vanilla44/source/i18n/reldtfmt.h 4.4.1/source/i18n/reldtfmt.h
98--- Vanilla44/source/i18n/reldtfmt.h    2010-04-28 17:27:10.044564480 +0200
99+++ 4.4.1/source/i18n/reldtfmt.h        2010-07-13 21:11:55.892600320 +0200
100@@ -78,7 +78,7 @@
101     virtual UBool operator==(const Format& other) const;
102 
103 
104-    using DateFormat::format;
105+    // using DateFormat::format;
106 
107     /**
108      * Format a date or time, which is the standard millis since 24:00 GMT, Jan
109diff -Naur Vanilla44/source/i18n/unicode/choicfmt.h 4.4.1/source/i18n/unicode/choicfmt.h
110--- Vanilla44/source/i18n/unicode/choicfmt.h    2010-04-28 17:27:04.024641536 +0200
111+++ 4.4.1/source/i18n/unicode/choicfmt.h        2010-07-13 20:00:17.147849216 +0200
112@@ -441,7 +441,7 @@
113     virtual const UnicodeString* getFormats(int32_t& count) const;
114 
115 
116-    using NumberFormat::format;
117+    // using NumberFormat::format;
118 
119     /**
120      * Format a double or long number using this object's choices.
121diff -Naur Vanilla44/source/i18n/unicode/datefmt.h 4.4.1/source/i18n/unicode/datefmt.h
122--- Vanilla44/source/i18n/unicode/datefmt.h     2010-04-28 17:27:04.024117248 +0200
123+++ 4.4.1/source/i18n/unicode/datefmt.h 2010-07-13 19:58:53.902561792 +0200
124@@ -212,7 +212,7 @@
125     virtual UBool operator==(const Format&) const;
126 
127 
128-    using Format::format;
129+    // using Format::format;
130 
131     /**
132      * Format an object to produce a string. This method handles Formattable
133diff -Naur Vanilla44/source/i18n/unicode/decimfmt.h 4.4.1/source/i18n/unicode/decimfmt.h
134--- Vanilla44/source/i18n/unicode/decimfmt.h    2010-04-28 17:27:04.018874368 +0200
135+++ 4.4.1/source/i18n/unicode/decimfmt.h        2010-07-13 19:57:46.009699328 +0200
136@@ -824,7 +824,7 @@
137     virtual UBool operator==(const Format& other) const;
138 
139 
140-    using NumberFormat::format;
141+    // using NumberFormat::format;
142 
143     /**
144      * Format a double or long number using base-10 representation.
145diff -Naur Vanilla44/source/i18n/unicode/dtitvfmt.h 4.4.1/source/i18n/unicode/dtitvfmt.h
146--- Vanilla44/source/i18n/unicode/dtitvfmt.h    2010-04-28 17:27:04.023592960 +0200
147+++ 4.4.1/source/i18n/unicode/dtitvfmt.h        2010-07-13 21:14:46.841482240 +0200
148@@ -363,7 +363,7 @@
149     UBool operator!=(const Format& other) const;
150 
151 
152-    using Format::format;
153+    // using Format::format;
154 
155     /**
156      * Format an object to produce a string. This method handles Formattable
157diff -Naur Vanilla44/source/i18n/unicode/msgfmt.h 4.4.1/source/i18n/unicode/msgfmt.h
158--- Vanilla44/source/i18n/unicode/msgfmt.h      2010-04-28 17:27:04.020447232 +0200
159+++ 4.4.1/source/i18n/unicode/msgfmt.h  2010-07-13 19:58:36.716177408 +0200
160@@ -584,7 +584,7 @@
161     virtual const Format** getFormats(int32_t& count) const;
162 
163 
164-    using Format::format;
165+    // using Format::format;
166 
167     /**
168      * Formats the given array of arguments into a user-readable string.
169diff -Naur Vanilla44/source/i18n/unicode/numfmt.h 4.4.1/source/i18n/unicode/numfmt.h
170--- Vanilla44/source/i18n/unicode/numfmt.h      2010-04-28 17:27:04.024117248 +0200
171+++ 4.4.1/source/i18n/unicode/numfmt.h  2010-07-13 19:57:14.623902720 +0200
172@@ -235,7 +235,7 @@
173     virtual UBool operator==(const Format& other) const;
174 
175 
176-    using Format::format;
177+    // using Format::format;
178 
179     /**
180      * Format an object to produce a string.  This method handles
181diff -Naur Vanilla44/source/i18n/unicode/plurfmt.h 4.4.1/source/i18n/unicode/plurfmt.h
182--- Vanilla44/source/i18n/unicode/plurfmt.h     2010-04-28 17:27:04.018350080 +0200
183+++ 4.4.1/source/i18n/unicode/plurfmt.h 2010-07-13 20:00:41.674496512 +0200
184@@ -308,7 +308,7 @@
185     void applyPattern(const UnicodeString& pattern, UErrorCode& status);
186 
187 
188-    using Format::format;
189+    // using Format::format;
190 
191     /**
192      * Formats a plural message for a given number.
193diff -Naur Vanilla44/source/i18n/unicode/rbnf.h 4.4.1/source/i18n/unicode/rbnf.h
194--- Vanilla44/source/i18n/unicode/rbnf.h        2010-04-28 17:27:04.027262976 +0200
195+++ 4.4.1/source/i18n/unicode/rbnf.h    2010-07-13 20:01:25.141295616 +0200
196@@ -722,7 +722,7 @@
197                           const Locale& locale = Locale::getDefault());
198 
199 
200-  using NumberFormat::format;
201+  // using NumberFormat::format;
202 
203   /**
204    * Formats the specified 32-bit number using the default ruleset.
205diff -Naur Vanilla44/source/i18n/unicode/selfmt.h 4.4.1/source/i18n/unicode/selfmt.h
206--- Vanilla44/source/i18n/unicode/selfmt.h      2010-04-28 17:27:04.027000832 +0200
207+++ 4.4.1/source/i18n/unicode/selfmt.h  2010-07-13 20:01:05.654573568 +0200
208@@ -220,7 +220,7 @@
209     void applyPattern(const UnicodeString& pattern, UErrorCode& status);
210 
211 
212-    using Format::format;
213+    // using Format::format;
214 
215     /**
216      * Selects the phrase for  the given keyword
217diff -Naur Vanilla44/source/i18n/unicode/smpdtfmt.h 4.4.1/source/i18n/unicode/smpdtfmt.h
218--- Vanilla44/source/i18n/unicode/smpdtfmt.h    2010-04-28 17:27:04.021495808 +0200
219+++ 4.4.1/source/i18n/unicode/smpdtfmt.h        2010-07-13 19:59:52.448004096 +0200
220@@ -368,7 +368,7 @@
221     virtual UBool operator==(const Format& other) const;
222 
223 
224-    using DateFormat::format;
225+    // using DateFormat::format;
226 
227     /**
228      * Format a date or time, which is the standard millis since 24:00 GMT, Jan
229@@ -1021,7 +1021,7 @@
230     /**
231      * Get the numbering system to be used for a particular field.
232      */
233-    using DateFormat::getNumberFormat;    // Do not hide visibility of base class function
234+    // using DateFormat::getNumberFormat;    // Do not hide visibility of base class function
235     NumberFormat * getNumberFormat(UDateFormatField index) const;
236 
237     /**
238diff -Naur Vanilla44/source/i18n/unicode/tmutfmt.h 4.4.1/source/i18n/unicode/tmutfmt.h
239--- Vanilla44/source/i18n/unicode/tmutfmt.h     2010-04-28 17:27:04.024641536 +0200
240+++ 4.4.1/source/i18n/unicode/tmutfmt.h 2010-07-13 21:15:38.484179968 +0200
241@@ -164,7 +164,7 @@
242     void setNumberFormat(const NumberFormat& format, UErrorCode& status);
243 
244 
245-    using MeasureFormat::format;
246+    // using MeasureFormat::format;
247 
248     /**
249      * Format a TimeUnitAmount.
250diff -Naur Vanilla44/source/i18n/uspoof_conf.cpp 4.4.1/source/i18n/uspoof_conf.cpp
251--- Vanilla44/source/i18n/uspoof_conf.cpp       2010-04-28 17:27:08.050593792 +0200
252+++ 4.4.1/source/i18n/uspoof_conf.cpp   2010-07-13 21:17:06.261095424 +0200
253@@ -106,8 +106,8 @@
254 // Conforms to the type signature for a USortComparator in uvector.h
255 
256 static int8_t U_CALLCONV SPUStringCompare(UHashTok left, UHashTok right) {
257-    const SPUString *sL = static_cast<const SPUString *>(left.pointer);
258-    const SPUString *sR = static_cast<const SPUString *>(right.pointer);
259+    const SPUString *sL = reinterpret_cast<const SPUString *>(left.pointer);
260+    const SPUString *sR = reinterpret_cast<const SPUString *>(right.pointer);
261     int32_t lenL = sL->fStr->length();
262     int32_t lenR = sR->fStr->length();
263     if (lenL < lenR) {
264diff -Naur Vanilla44/source/io/unicode/ustream.h 4.4.1/source/io/unicode/ustream.h
265--- Vanilla44/source/io/unicode/ustream.h       2010-04-28 17:27:52.053477376 +0200
266+++ 4.4.1/source/io/unicode/ustream.h   2010-07-14 00:22:24.460587008 +0200
267@@ -26,7 +26,7 @@
268  * C++ I/O stream API.
269  */
270 
271-#if U_IOSTREAM_SOURCE >= 199711
272+#if 0 /*U_IOSTREAM_SOURCE >= 199711*/
273 #include <istream>
274 #include <ostream>
275diff -Naur Vanilla44/source/tools/gennorm2/n2builder.cpp 4.4.1/source/tools/gennorm2/n2builder.cpp
276--- Vanilla44/source/tools/gennorm2/n2builder.cpp       2010-04-28 17:27:42.057409536 +0200
277+++ 4.4.1/source/tools/gennorm2/n2builder.cpp   2010-07-13 21:49:50.110362624 +0200
278@@ -674,7 +674,7 @@
279     }
280     int32_t length=p->compositions->size();
281     for(int32_t i=0; i<length; ++i) {
282-        CompositionPair &pair=p->compositions->at(i);
283+        CompositionPair &pair=(*p->compositions)[i];
284         // 22 bits for the composite character and whether it combines forward.
285         UChar32 compositeAndFwd=pair.composite<<1;
286         if(getNormRef(pair.composite).compositions!=NULL) {
287diff -Naur Vanilla44/source/tools/pkgdata/pkgdata.cpp 4.4.1/source/tools/pkgdata/pkgdata.cpp
288--- Vanilla44/source/tools/pkgdata/pkgdata.cpp  2010-04-28 17:27:46.036438016 +0200
289+++ 4.4.1/source/tools/pkgdata/pkgdata.cpp      2010-07-14 00:13:16.915144704 +0200
290@@ -472,7 +472,7 @@
291 }
292 
293 static int runCommand(const char* command, UBool specialHandling) {
294-    char cmd[SMALL_BUFFER_MAX_SIZE];
295+    char cmd[64000];
296 
297     if (!specialHandling) {
298 #ifdef USING_CYGWIN
299@@ -1154,7 +1154,7 @@
300     DATA_PREFIX_LENGTH
301 };
302 
303-const static char DATA_PREFIX[DATA_PREFIX_LENGTH][10] = {
304+static const char DATA_PREFIX[DATA_PREFIX_LENGTH][10] = {
305         "brkitr",
306         "coll",
307         "curr",

Download in other formats:

  • Original Format
Trac Powered

Powered by Trac 0.13dev-r10686
By Edgewall Software.

Visit the Trac open source project at
http://trac.edgewall.org/