From fab121441cdb2c583a2af7da73043deb3f6d6f56 Mon Sep 17 00:00:00 2001
From: Ram Viswanadha <rviswanadha@gmail.com>
Date: Fri, 25 Jul 2003 16:01:32 +0000
Subject: [PATCH] ICU-3050 Fix compiler warnings and build failures on AIX and
 Solaris

X-SVN-Rev: 12688
---
 icu4c/source/common/sprpimpl.h       |  4 ++--
 icu4c/source/common/usprep.cpp       |  5 +----
 icu4c/source/test/cintltst/nfsprep.c | 12 ++++++------
 3 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/icu4c/source/common/sprpimpl.h b/icu4c/source/common/sprpimpl.h
index 7d496899624..606d311d18f 100644
--- a/icu4c/source/common/sprpimpl.h
+++ b/icu4c/source/common/sprpimpl.h
@@ -34,7 +34,7 @@ enum UStringPrepType{
     USPREP_PROHIBITED           = 0x0002 , 
     USPREP_LABEL_SEPARATOR      = 0x0003 ,
     USPREP_DELETE               = 0x0004 ,
-    USPREP_TYPE_LIMIT           = 0x0005 , 
+    USPREP_TYPE_LIMIT           = 0x0005  
 };
 
 typedef enum UStringPrepType UStringPrepType;
@@ -49,7 +49,7 @@ static const char* usprepTypeNames[] ={
 };
 enum{
     _SPREP_NORMALIZATION_ON = 0x0001,
-    _SPREP_CHECK_BIDI_ON    = 0x0002,
+    _SPREP_CHECK_BIDI_ON    = 0x0002
 };
 
 enum{
diff --git a/icu4c/source/common/usprep.cpp b/icu4c/source/common/usprep.cpp
index dbcbc67d4d6..d30758710a9 100644
--- a/icu4c/source/common/usprep.cpp
+++ b/icu4c/source/common/usprep.cpp
@@ -71,9 +71,6 @@ getFoldingOffset(uint32_t data) {
 
 }
 
-U_CDECL_END
-
-
 /* hashes an entry  */
 static int32_t U_EXPORT2 U_CALLCONV 
 hashEntry(const UHashTok parm) {
@@ -98,7 +95,7 @@ compareEntries(const UHashTok p1, const UHashTok p2) {
         uhash_compareChars(path1, path2)));
 }
 
-
+U_CDECL_END
 
 U_CFUNC void 
 usprep_init(UErrorCode *status) {
diff --git a/icu4c/source/test/cintltst/nfsprep.c b/icu4c/source/test/cintltst/nfsprep.c
index 83bfcf15b5c..9bbd722bb89 100644
--- a/icu4c/source/test/cintltst/nfsprep.c
+++ b/icu4c/source/test/cintltst/nfsprep.c
@@ -43,7 +43,7 @@ nfs4_prepare( const char* src, int32_t srcLength,
           b2Stack[NFS4_MAX_BUFFER_SIZE]; 
     char  b3Stack[NFS4_MAX_BUFFER_SIZE];
 
-    //initialize pointers to stack buffers
+    /* initialize pointers to stack buffers */
     UChar *b1 = b1Stack, *b2 = b2Stack;
     char  *b3=b3Stack;
     int32_t b1Len=0, b2Len=0, b3Len=0,
@@ -141,17 +141,17 @@ syntaxError( const UChar* rules,
         pos--;
     }
     parseError->offset = pos;
-    parseError->line = 0 ; // we are not using line numbers 
+    parseError->line = 0 ; /* we are not using line numbers */
     
-    // for pre-context
+    /* for pre-context */
     start = (pos <=U_PARSE_CONTEXT_LEN)? 0 : (pos - (U_PARSE_CONTEXT_LEN-1));
     stop  = pos;
     
     u_memcpy(parseError->preContext,rules+start,stop-start);
-    //null terminate the buffer
+    /* null terminate the buffer */
     parseError->preContext[stop-start] = 0;
     
-    //for post-context
+    /* for post-context */
     start = pos;
     if(start<rulesLen) {
         U16_FWD_1(rules, start, rulesLen);
@@ -161,7 +161,7 @@ syntaxError( const UChar* rules,
                                                             rulesLen;
     if(start < stop){
         u_memcpy(parseError->postContext,rules+start,stop-start);
-        //null terminate the buffer
+        /* null terminate the buffer */
         parseError->postContext[stop-start]= 0;
     }