From ecd01239d51096d9e205bf7d00c0c3421ad3244d Mon Sep 17 00:00:00 2001
From: George Rhoten <grhoten@users.noreply.github.com>
Date: Fri, 16 Jul 2004 15:44:52 +0000
Subject: [PATCH] ICU-3946 Fix some tests to use U_EXPORT2 and U_CALLCONV more
 often

X-SVN-Rev: 16021
---
 icu4c/source/test/intltest/canittst.cpp |  3 ++-
 icu4c/source/test/intltest/idnaref.cpp  | 10 +++++-----
 icu4c/source/test/intltest/idnaref.h    | 10 +++++-----
 icu4c/source/test/intltest/testidna.h   |  4 ++--
 4 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/icu4c/source/test/intltest/canittst.cpp b/icu4c/source/test/intltest/canittst.cpp
index 22a3b92c23f..9a6695c9884 100644
--- a/icu4c/source/test/intltest/canittst.cpp
+++ b/icu4c/source/test/intltest/canittst.cpp
@@ -232,7 +232,8 @@ UnicodeString CanonicalIteratorTest::getReadable(const UnicodeString &s) {
     //return "[" + (verbose ? name->transliterate(s) + "; " : "") + hex->transliterate(s) + "]";
 }
 
-U_CFUNC int compareUnicodeStrings(const void *s1, const void *s2) {
+U_CFUNC int U_CALLCONV
+compareUnicodeStrings(const void *s1, const void *s2) {
   UnicodeString **st1 = (UnicodeString **)s1;
   UnicodeString **st2 = (UnicodeString **)s2;
 
diff --git a/icu4c/source/test/intltest/idnaref.cpp b/icu4c/source/test/intltest/idnaref.cpp
index 9df4eda554d..91ca6721faa 100644
--- a/icu4c/source/test/intltest/idnaref.cpp
+++ b/icu4c/source/test/intltest/idnaref.cpp
@@ -241,7 +241,7 @@ CLEANUP:
 
 
 
-U_CFUNC int32_t  
+U_CFUNC int32_t U_EXPORT2
 idnaref_toASCII(const UChar* src, int32_t srcLength, 
 			  UChar* dest, int32_t destCapacity,
               int32_t options,
@@ -391,7 +391,7 @@ CLEANUP:
 }
 
 
-U_CFUNC int32_t  
+U_CFUNC int32_t U_EXPORT2
 idnaref_toUnicode(const UChar* src, int32_t srcLength,
 				UChar* dest, int32_t destCapacity,
                 int32_t options,
@@ -640,7 +640,7 @@ getNextSeparator(UChar *src,int32_t srcLength,NamePrepTransform* prep,
     }
 }
 
-U_CFUNC int32_t 
+U_CFUNC int32_t U_EXPORT2
 idnaref_IDNToASCII(  const UChar* src, int32_t srcLength,
 				   UChar* dest, int32_t destCapacity,
 				   int32_t options,
@@ -792,7 +792,7 @@ CLEANUP:
     return u_terminateUChars(dest, destCapacity, reqLength, status);
 }
 
-U_CFUNC int32_t
+U_CFUNC int32_t U_EXPORT2
 idnaref_IDNToUnicode(  const UChar* src, int32_t srcLength,
 				     UChar* dest, int32_t destCapacity,
 					 int32_t options,
@@ -941,7 +941,7 @@ CLEANUP:
     return u_terminateUChars(dest, destCapacity, reqLength, status);
 }
 
-U_CFUNC int32_t
+U_CFUNC int32_t U_EXPORT2
 idnaref_compare(  const UChar *s1, int32_t length1,
                 const UChar *s2, int32_t length2,
 				int32_t options,
diff --git a/icu4c/source/test/intltest/idnaref.h b/icu4c/source/test/intltest/idnaref.h
index 07654783e43..37e15b84e89 100644
--- a/icu4c/source/test/intltest/idnaref.h
+++ b/icu4c/source/test/intltest/idnaref.h
@@ -59,7 +59,7 @@
  * @return                  Number of ASCII characters converted.
  * @draft ICU 2.6
  */
-U_CFUNC int32_t 
+U_CFUNC int32_t U_EXPORT2
 idnaref_toASCII(const UChar* src, int32_t srcLength, 
               UChar* dest, int32_t destCapacity,
               int32_t options,
@@ -98,7 +98,7 @@ idnaref_toASCII(const UChar* src, int32_t srcLength,
  * @return                  Number of Unicode characters converted.
  * @draft ICU 2.6
  */
-U_CFUNC int32_t 
+U_CFUNC int32_t U_EXPORT2
 idnaref_toUnicode(const UChar* src, int32_t srcLength,
                 UChar* dest, int32_t destCapacity,
                 int32_t options,
@@ -142,7 +142,7 @@ idnaref_toUnicode(const UChar* src, int32_t srcLength,
  * @return                  Number of ASCII characters converted.
  * @draft ICU 2.6
  */
-U_CFUNC int32_t  
+U_CFUNC int32_t U_EXPORT2
 idnaref_IDNToASCII(  const UChar* src, int32_t srcLength,
                    UChar* dest, int32_t destCapacity,
                    int32_t options,
@@ -182,7 +182,7 @@ idnaref_IDNToASCII(  const UChar* src, int32_t srcLength,
  * @return                  Number of ASCII characters converted.
  * @draft ICU 2.6
  */
-U_CFUNC int32_t  
+U_CFUNC int32_t U_EXPORT2
 idnaref_IDNToUnicode(  const UChar* src, int32_t srcLength,
                      UChar* dest, int32_t destCapacity,
                      int32_t options,
@@ -217,7 +217,7 @@ idnaref_IDNToUnicode(  const UChar* src, int32_t srcLength,
  * @return <0 or 0 or >0 as usual for string comparisons
  * @draft ICU 2.6
  */
-U_CFUNC int32_t  
+U_CFUNC int32_t U_EXPORT2
 idnaref_compare(  const UChar *s1, int32_t length1,
                 const UChar *s2, int32_t length2,
                 int32_t options,
diff --git a/icu4c/source/test/intltest/testidna.h b/icu4c/source/test/intltest/testidna.h
index 3e92b1a547d..e20d8087d08 100644
--- a/icu4c/source/test/intltest/testidna.h
+++ b/icu4c/source/test/intltest/testidna.h
@@ -27,12 +27,12 @@
 
 U_CDECL_BEGIN
 typedef int32_t  
-(*TestFunc) (   const UChar *src, int32_t srcLength,
+(U_EXPORT2 *TestFunc) (   const UChar *src, int32_t srcLength,
                 UChar *dest, int32_t destCapacity,
                 int32_t options, UParseError *parseError,
                 UErrorCode *status);
 typedef int32_t  
-(*CompareFunc) (const UChar *s1, int32_t s1Len,
+(U_EXPORT2 *CompareFunc) (const UChar *s1, int32_t s1Len,
                 const UChar *s2, int32_t s2Len,
                 int32_t options,
                 UErrorCode *status);