From 7dda8403947b75b5db6c165260e8f24c9e78b6f5 Mon Sep 17 00:00:00 2001
From: Markus Scherer <markus.icu@gmail.com>
Date: Mon, 18 Oct 1999 23:55:05 +0000
Subject: [PATCH] more renaming of constant names

X-Trac-URL: https://ssl.icu-project.org/trac/ticket/6

FAILURE -> U_FAILURE etc.


git-svn-id: http://source.icu-project.org/repos/icu/icu/trunk@81 0a8b766c-62c9-45f9-954d-7f2943c9ead0
---
 source/samples/cal/uprint.h      | 2 +-
 source/samples/date/uprint.h     | 2 +-
 source/test/cintltst/ccapitst.h  | 4 ++--
 source/test/cintltst/nccbtst.h   | 4 ++--
 source/test/intltest/cpputils.h  | 8 ++++----
 source/test/intltest/ittxtbd.cpp | 2 +-
 6 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/source/samples/cal/uprint.h b/source/samples/cal/uprint.h
index 534d048dea2..e20997789ec 100644
--- a/source/samples/cal/uprint.h
+++ b/source/samples/cal/uprint.h
@@ -26,6 +26,6 @@
 #include "utypes.h"
 
 /* Print a ustring to the specified FILE* in the default codepage */
-CAPI void uprint(const UChar *s, FILE *f, UErrorCode *status);
+U_CAPI void uprint(const UChar *s, FILE *f, UErrorCode *status);
 
 #endif /* ! UPRINT_H */
diff --git a/source/samples/date/uprint.h b/source/samples/date/uprint.h
index 534d048dea2..e20997789ec 100644
--- a/source/samples/date/uprint.h
+++ b/source/samples/date/uprint.h
@@ -26,6 +26,6 @@
 #include "utypes.h"
 
 /* Print a ustring to the specified FILE* in the default codepage */
-CAPI void uprint(const UChar *s, FILE *f, UErrorCode *status);
+U_CAPI void uprint(const UChar *s, FILE *f, UErrorCode *status);
 
 #endif /* ! UPRINT_H */
diff --git a/source/test/cintltst/ccapitst.h b/source/test/cintltst/ccapitst.h
index 136ae7020b2..035e8d0cfd2 100644
--- a/source/test/cintltst/ccapitst.h
+++ b/source/test/cintltst/ccapitst.h
@@ -18,8 +18,8 @@
 *     Madhu Katragadda            Converted to C
 *********************************************************************************
 */
-#ifndef _CCAPITSTST
-#define _CCAPITSTST
+#ifndef _CU_CAPITSTST
+#define _CU_CAPITSTST
 /* C API TEST FOR CODESET CONVERSION COMPONENT */
 #include "cintltst.h"
 #include "utypes.h"
diff --git a/source/test/cintltst/nccbtst.h b/source/test/cintltst/nccbtst.h
index 186512efb2c..923068a3fd1 100644
--- a/source/test/cintltst/nccbtst.h
+++ b/source/test/cintltst/nccbtst.h
@@ -41,11 +41,11 @@ static void TestLegalAndOthers(int32_t inputsize, int32_t outputsize);
 static void TestSingleByte(int32_t inputsize, int32_t outputsize);
 
 bool_t testConvertFromUnicode(const UChar *source, int sourceLen,  const char *expect, int expectLen, 
-			    const char *codepage, UCNV_FromUCallBack callback, int32_t *expectOffsets);
+			    const char *codepage, UConverterFromUCallback callback, int32_t *expectOffsets);
 
 
 bool_t testConvertToUnicode( const char *source, int sourcelen, const UChar *expect, int expectlen, 
-		       const char *codepage, UCNV_ToUCallBack callback, int32_t *expectOffsets);
+		       const char *codepage, UConverterToUCallback callback, int32_t *expectOffsets);
 
 
 static void printSeq(const char* a, int len);
diff --git a/source/test/intltest/cpputils.h b/source/test/intltest/cpputils.h
index 69a5d5f112b..3225e5d1c19 100644
--- a/source/test/intltest/cpputils.h
+++ b/source/test/intltest/cpputils.h
@@ -2,8 +2,8 @@
 Bertrand A. D.*/
 
 #include "utypes.h"
-CAPI void  printUChar(const UChar*      uniString);
-CAPI void  printChar(   const char*         charString);
+U_CAPI void  printUChar(const UChar*      uniString);
+U_CAPI void  printChar(   const char*         charString);
 
-CAPI void T_PlatformUtilities_pathnameInContext( char *fullname, int32_t maxsize, const char * relPath);
-CAPI const char *T_PlatformUtilities_getDefaultDataDirectory(void);
+U_CAPI void T_PlatformUtilities_pathnameInContext( char *fullname, int32_t maxsize, const char * relPath);
+U_CAPI const char *T_PlatformUtilities_getDefaultDataDirectory(void);
diff --git a/source/test/intltest/ittxtbd.cpp b/source/test/intltest/ittxtbd.cpp
index 4a6d406fd0a..f915bf4fc49 100644
--- a/source/test/intltest/ittxtbd.cpp
+++ b/source/test/intltest/ittxtbd.cpp
@@ -1031,7 +1031,7 @@ void IntlTestTextBoundary::runIndexedTest( int32_t index, bool_t exec, char* &na
             name = "BreakIteratorCAPI"; 
             if (exec) {
                 logln("BreakIterator C API test---"); logln("");
-                IntlTestBreakIteratorFormatCAPI test;
+                IntlTestBreakIteratorFormatU_CAPI test;
                 callTest( test, par );
             }
             break;