X-Git-Url: https://git.saurik.com/apple/icu.git/blobdiff_plain/73c04bcfe1096173b00431f0cdc742894b15eef0..7393aa2fd2c40c89f12c2db881842a563afdb429:/icuSources/test/cintltst/callcoll.h

diff --git a/icuSources/test/cintltst/callcoll.h b/icuSources/test/cintltst/callcoll.h
index af2cd940..d7c6c056 100644
--- a/icuSources/test/cintltst/callcoll.h
+++ b/icuSources/test/cintltst/callcoll.h
@@ -1,6 +1,6 @@
 /********************************************************************
  * COPYRIGHT: 
- * Copyright (c) 1997-2006, International Business Machines Corporation and
+ * Copyright (c) 1997-2008, International Business Machines Corporation and
  * others. All Rights Reserved.
  ********************************************************************/
 /********************************************************************************
@@ -29,23 +29,30 @@
 
 #define RULE_BUFFER_LEN 8192
 
+struct OrderAndOffset
+{
+    int32_t order;
+    int32_t offset;
+};
+
+typedef struct OrderAndOffset OrderAndOffset;
 
     /* tests comparison of custom collation with different strengths */
 void doTest(UCollator*, const UChar* source, const UChar* target, UCollationResult result);
 /* verify that iterating forward and backwards over the string yields same CEs */
 void backAndForth(UCollationElements *iter);
 /* gets an array of CEs for a string in UCollationElements iterator. */
-int32_t* getOrders(UCollationElements *iter, int32_t *orderLength);
-
-void genericOrderingTestWithResult(UCollator *coll, const char *s[], uint32_t size, UCollationResult result);
-void genericOrderingTest(UCollator *coll, const char *s[], uint32_t size);
-void genericLocaleStarter(const char *locale, const char *s[], uint32_t size);
-void genericLocaleStarterWithResult(const char *locale, const char *s[], uint32_t size, UCollationResult result);
-void genericLocaleStarterWithOptions(const char *locale, const char *s[], uint32_t size, const UColAttribute *attrs, const UColAttributeValue *values, uint32_t attsize);
-void genericLocaleStarterWithOptionsAndResult(const char *locale, const char *s[], uint32_t size, const UColAttribute *attrs, const UColAttributeValue *values, uint32_t attsize, UCollationResult result);
-void genericRulesStarterWithResult(const char *rules, const char *s[], uint32_t size, UCollationResult result);
-void genericRulesStarter(const char *rules, const char *s[], uint32_t size);
-void genericRulesStarterWithOptionsAndResult(const char *rules, const char *s[], uint32_t size, const UColAttribute *attrs, const UColAttributeValue *values, uint32_t attsize, UCollationResult result);
+OrderAndOffset* getOrders(UCollationElements *iter, int32_t *orderLength);
+
+void genericOrderingTestWithResult(UCollator *coll, const char * const s[], uint32_t size, UCollationResult result);
+void genericOrderingTest(UCollator *coll, const char * const s[], uint32_t size);
+void genericLocaleStarter(const char *locale, const char * const s[], uint32_t size);
+void genericLocaleStarterWithResult(const char *locale, const char * const s[], uint32_t size, UCollationResult result);
+void genericLocaleStarterWithOptions(const char *locale, const char * const s[], uint32_t size, const UColAttribute *attrs, const UColAttributeValue *values, uint32_t attsize);
+void genericLocaleStarterWithOptionsAndResult(const char *locale, const char * const s[], uint32_t size, const UColAttribute *attrs, const UColAttributeValue *values, uint32_t attsize, UCollationResult result);
+void genericRulesStarterWithResult(const char *rules, const char * const s[], uint32_t size, UCollationResult result);
+void genericRulesStarter(const char *rules, const char * const s[], uint32_t size);
+void genericRulesStarterWithOptionsAndResult(const char *rules, const char * const s[], uint32_t size, const UColAttribute *attrs, const UColAttributeValue *values, uint32_t attsize, UCollationResult result);
 UBool hasCollationElements(const char *locName);