ICU-66108.tar.gz

[apple/icu.git] / icuSources / tools / genrb / ustr.h

diff --git a/icuSources/tools/genrb/ustr.h b/icuSources/tools/genrb/ustr.h
index 085643a8d7a7d25985917f4ef445cc83e934383a..8a69e9d4d5cb98351becaec36164625d85436fa8 100644 (file)
--- a/icuSources/tools/genrb/ustr.h
+++ b/icuSources/tools/genrb/ustr.h
@@ -1,7 +1,9 @@
+// © 2016 and later: Unicode, Inc. and others.
+// License & terms of use: http://www.unicode.org/copyright.html
 /*
 *******************************************************************************
 *
-*   Copyright (C) 1998-2003, International Business Machines
+*   Copyright (C) 1998-2012, International Business Machines
 *   Corporation and others.  All Rights Reserved.
 *
 *******************************************************************************
@@ -20,7 +22,7 @@
 
 #include "unicode/utypes.h"
 
-#define U_APPEND_CHAR32(c,target,len) {                         \
+#define U_APPEND_CHAR32(c,target,len) UPRV_BLOCK_MACRO_BEGIN {  \
     if (c <= 0xffff)                                            \
     {                                                           \
         *(target)++ = (UChar) c;                                \
@@ -33,7 +35,20 @@
         len=2;                                                  \
         target +=2;                                             \
     }                                                           \
-}
+} UPRV_BLOCK_MACRO_END
+
+#define U_APPEND_CHAR32_ONLY(c,target) UPRV_BLOCK_MACRO_BEGIN { \
+    if (c <= 0xffff)                                            \
+    {                                                           \
+        *(target)++ = (UChar) c;                                \
+    }                                                           \
+    else                                                        \
+    {                                                           \
+        target[0] = U16_LEAD(c);                                \
+        target[1] = U16_TRAIL(c);                               \
+        target +=2;                                             \
+    }                                                           \
+} UPRV_BLOCK_MACRO_END
 
 /* A C representation of a string "object" (to avoid realloc all the time) */
 struct UString {
@@ -42,25 +57,25 @@ struct UString {
   int32_t fCapacity;
 };
 
-void ustr_init(struct UString *s);
+U_CFUNC void ustr_init(struct UString *s);
 
-void
+U_CFUNC void
 ustr_initChars(struct UString *s, const char* source, int32_t length, UErrorCode *status);
 
-void ustr_deinit(struct UString *s);
+U_CFUNC void ustr_deinit(struct UString *s);
 
-void ustr_setlen(struct UString *s, int32_t len, UErrorCode *status);
+U_CFUNC void ustr_setlen(struct UString *s, int32_t len, UErrorCode *status);
 
-void ustr_cpy(struct UString *dst, const struct UString *src,
-          UErrorCode *status);
+U_CFUNC void ustr_cpy(struct UString *dst, const struct UString *src,
+                      UErrorCode *status);
 
-void ustr_cat(struct UString *dst, const struct UString *src,
-          UErrorCode *status);
+U_CFUNC void ustr_cat(struct UString *dst, const struct UString *src,
+                      UErrorCode *status);
 
-void ustr_ncat(struct UString *dst, const struct UString *src,
-           int32_t n, UErrorCode *status);
+U_CFUNC void ustr_ncat(struct UString *dst, const struct UString *src,
+                       int32_t n, UErrorCode *status);
 
-void ustr_ucat(struct UString *dst, UChar c, UErrorCode *status);
-void ustr_u32cat(struct UString *dst, UChar32 c, UErrorCode *status);
-void ustr_uscat(struct UString *dst, const UChar* src,int len,UErrorCode *status);
+U_CFUNC void ustr_ucat(struct UString *dst, UChar c, UErrorCode *status);
+U_CFUNC void ustr_u32cat(struct UString *dst, UChar32 c, UErrorCode *status);
+U_CFUNC void ustr_uscat(struct UString *dst, const UChar* src,int len,UErrorCode *status);
 #endif