merge from gcc

diff --git a/include/ChangeLog b/include/ChangeLog
index d26ba1d4e4442add3613f141c328a284db0f8489..5e9ac7a10f9ca718883948de49d9cc54b507f5e4 100644 (file)
--- a/include/ChangeLog
+++ b/include/ChangeLog
@@ -1,3 +1,9 @@
+2003-06-22  Zack Weinberg  <zack@codesourcery.com>
+
+       * safe-ctype.h (HC_UNKNOWN, HC_ASCII, HC_EBCDIC): Rename to
+       HOST_CHARSET_UNKNOWN, HOST_CHARSET_ASCII, HOST_CHARSET_EBCDIC
+       respectively.
+
 2003-06-21  Zack Weinberg  <zack@codesourcery.com>
 
        * safe-ctype.h (HC_UNKNOWN, HC_ASCII, HC_EBCDIC, HOST_CHARSET):

diff --git a/include/safe-ctype.h b/include/safe-ctype.h
index c3e154c6f9f97cf1322d640a610d12c041678290..69a3f74cc6fc48a38e489fe9acd9e3735469881c 100644 (file)
--- a/include/safe-ctype.h
+++ b/include/safe-ctype.h
@@ -40,19 +40,19 @@ Boston, MA 02111-1307, USA.  */
 #endif
 
 /* Determine host character set.  */
-#define HC_UNKNOWN 0
-#define HC_ASCII   1
-#define HC_EBCDIC  2
+#define HOST_CHARSET_UNKNOWN 0
+#define HOST_CHARSET_ASCII   1
+#define HOST_CHARSET_EBCDIC  2
 
 #if  '\n' == 0x0A && ' ' == 0x20 && '0' == 0x30 \
    && 'A' == 0x41 && 'a' == 0x61 && '!' == 0x21
-#  define HOST_CHARSET HC_ASCII
+#  define HOST_CHARSET HOST_CHARSET_ASCII
 #else
 # if '\n' == 0x15 && ' ' == 0x40 && '0' == 0xF0 \
    && 'A' == 0xC1 && 'a' == 0x81 && '!' == 0x5A
-#  define HOST_CHARSET HC_EBCDIC
+#  define HOST_CHARSET HOST_CHARSET_EBCDIC
 # else
-#  define HOST_CHARSET HC_UNKNOWN
+#  define HOST_CHARSET HOST_CHARSET_UNKNOWN
 # endif
 #endif