From 173a4678e2caab6ccdf5194144dc1b5b60e1a07b Mon Sep 17 00:00:00 2001
From: Markus Scherer <markus.icu@gmail.com>
Date: Fri, 17 Aug 2001 00:18:25 +0000
Subject: [PATCH] ICU-1007 rename GrowBuffer to UGrowBuffer to avoid potential
 naming conflicts

X-SVN-Rev: 5487
---
 icu4c/source/common/uchar.c          |  6 +++---
 icu4c/source/common/unicode/unistr.h |  2 +-
 icu4c/source/common/ustr_imp.h       | 18 +++++++++---------
 icu4c/source/common/ustring.c        |  2 +-
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/icu4c/source/common/uchar.c b/icu4c/source/common/uchar.c
index d59be4fd12a..3bfd6f0137b 100644
--- a/icu4c/source/common/uchar.c
+++ b/icu4c/source/common/uchar.c
@@ -1003,7 +1003,7 @@ U_CFUNC int32_t
 u_internalStrToLower(UChar *dest, int32_t destCapacity,
                      const UChar *src, int32_t srcLength,
                      const char *locale,
-                     GrowBuffer *growBuffer, void *context,
+                     UGrowBuffer *growBuffer, void *context,
                      UErrorCode *pErrorCode) {
     UChar buffer[UTF_MAX_CHAR_LENGTH];
     uint32_t *pe;
@@ -1182,7 +1182,7 @@ U_CFUNC int32_t
 u_internalStrToUpper(UChar *dest, int32_t destCapacity,
                      const UChar *src, int32_t srcLength,
                      const char *locale,
-                     GrowBuffer *growBuffer, void *context,
+                     UGrowBuffer *growBuffer, void *context,
                      UErrorCode *pErrorCode) {
     UChar buffer[UTF_MAX_CHAR_LENGTH];
     uint32_t *pe;
@@ -1482,7 +1482,7 @@ U_CFUNC int32_t
 u_internalStrFoldCase(UChar *dest, int32_t destCapacity,
                       const UChar *src, int32_t srcLength,
                       uint32_t options,
-                      GrowBuffer *growBuffer, void *context,
+                      UGrowBuffer *growBuffer, void *context,
                       UErrorCode *pErrorCode) {
     UChar buffer[UTF_MAX_CHAR_LENGTH];
     uint32_t *pe;
diff --git a/icu4c/source/common/unicode/unistr.h b/icu4c/source/common/unicode/unistr.h
index bb2f04747aa..d321802dbc5 100644
--- a/icu4c/source/common/unicode/unistr.h
+++ b/icu4c/source/common/unicode/unistr.h
@@ -2354,7 +2354,7 @@ private:
                             int32_t **pBufferToDelete = 0,
                             UBool forceClone = FALSE);
 
-  // GrowBuffer function for string case mapping
+  // UGrowBuffer function for string case mapping and similar
   static UBool U_CALLCONV
   growBuffer(void *context,
              UChar **buffer, int32_t *pCapacity, int32_t reqCapacity,
diff --git a/icu4c/source/common/ustr_imp.h b/icu4c/source/common/ustr_imp.h
index 81914f2c652..6418b52f945 100644
--- a/icu4c/source/common/ustr_imp.h
+++ b/icu4c/source/common/ustr_imp.h
@@ -33,14 +33,14 @@ uprv_haveProperties(void);
  * @internal
  */
 typedef UBool U_CALLCONV
-GrowBuffer(void *context,       /* opaque pointer for this function */
-           UChar **pBuffer,     /* in/out destination buffer pointer */
-           int32_t *pCapacity,  /* in/out buffer capacity in numbers of UChars */
-           int32_t reqCapacity, /* requested capacity */
-           int32_t length);     /* number of UChars to be copied to new buffer */
+UGrowBuffer(void *context,      /* opaque pointer for this function */
+            UChar **pBuffer,    /* in/out destination buffer pointer */
+            int32_t *pCapacity, /* in/out buffer capacity in numbers of UChars */
+            int32_t reqCapacity,/* requested capacity */
+            int32_t length);    /* number of UChars to be copied to new buffer */
 
 /**
- * Default implementation of GrowBuffer.
+ * Default implementation of UGrowBuffer.
  * Takes a static buffer as context, allocates a new buffer,
  * and releases the old one if it is not the same as the one passed as context.
  * @internal
@@ -59,7 +59,7 @@ U_CFUNC int32_t
 u_internalStrToLower(UChar *dest, int32_t destCapacity,
                      const UChar *src, int32_t srcLength,
                      const char *locale,
-                     GrowBuffer *growBuffer, void *context,
+                     UGrowBuffer *growBuffer, void *context,
                      UErrorCode *pErrorCode);
 
 /**
@@ -69,7 +69,7 @@ U_CFUNC int32_t
 u_internalStrToUpper(UChar *dest, int32_t destCapacity,
                      const UChar *src, int32_t srcLength,
                      const char *locale,
-                     GrowBuffer *growBuffer, void *context,
+                     UGrowBuffer *growBuffer, void *context,
                      UErrorCode *pErrorCode);
 
 /**
@@ -80,7 +80,7 @@ U_CFUNC int32_t
 u_internalStrFoldCase(UChar *dest, int32_t destCapacity,
                       const UChar *src, int32_t srcLength,
                       uint32_t options,
-                      GrowBuffer *growBuffer, void *context,
+                      UGrowBuffer *growBuffer, void *context,
                       UErrorCode *pErrorCode);
 
 /**
diff --git a/icu4c/source/common/ustring.c b/icu4c/source/common/ustring.c
index 6644bc1c648..387d311854d 100644
--- a/icu4c/source/common/ustring.c
+++ b/icu4c/source/common/ustring.c
@@ -1268,7 +1268,7 @@ u_unescape(const char *src, UChar *dest, int32_t destCapacity) {
     return 0;
 }
 
-/* C GrowBuffer implementation ---------------------------------------------- */
+/* C UGrowBuffer implementation --------------------------------------------- */
 
 U_CAPI UBool /* U_CALLCONV U_EXPORT2 */
 u_growBufferFromStatic(void *context,