ICU-66108.tar.gz

[apple/icu.git] / icuSources / common / loclikely.cpp

diff --git a/icuSources/common/loclikely.cpp b/icuSources/common/loclikely.cpp
index 2f64e104b58254a8b9fe5e2bc83ad779c760e890..55dac9836eb089a1a65f95ce1137ac62492303e3 100644 (file)
--- a/icuSources/common/loclikely.cpp
+++ b/icuSources/common/loclikely.cpp
@@ -811,24 +811,24 @@ error:
     return FALSE;
 }
 
     return FALSE;
 }
 

-#define CHECK_TRAILING_VARIANT_SIZE(trailing, trailingLength) \
-    {   int32_t count = 0; \
-        int32_t i; \
-        for (i = 0; i < trailingLength; i++) { \
-            if (trailing[i] == '-' || trailing[i] == '_') { \
-                count = 0; \
-                if (count > 8) { \
-                    goto error; \
-                } \
-            } else if (trailing[i] == '@') { \
-                break; \
-            } else if (count > 8) { \
+#define CHECK_TRAILING_VARIANT_SIZE(trailing, trailingLength) UPRV_BLOCK_MACRO_BEGIN { \
+    int32_t count = 0; \
+    int32_t i; \
+    for (i = 0; i < trailingLength; i++) { \
+        if (trailing[i] == '-' || trailing[i] == '_') { \
+            count = 0; \
+            if (count > 8) { \

                 goto error; \
                 goto error; \

-            } else { \
-                count++; \

             } \
             } \

+        } else if (trailing[i] == '@') { \
+            break; \
+        } else if (count > 8) { \
+            goto error; \
+        } else { \
+            count++; \

         } \
         } \

-    }
+    } \
+} UPRV_BLOCK_MACRO_END

 
 static void
 _uloc_addLikelySubtags(const char* localeID,
 
 static void
 _uloc_addLikelySubtags(const char* localeID,