merge from gcc

diff --git a/include/ChangeLog b/include/ChangeLog
index 11eacd9b28e103ea0d67bb54b25c070b024043c0..8eb61e64a1c623983b2f0bd27408399268e62cde 100644 (file)
--- a/include/ChangeLog
+++ b/include/ChangeLog
@@ -1,3 +1,8 @@
+2001-03-01  John David Anglin  <dave@hiauly1.hia.nrc.ca>
+
+       * safe-ctype.h (_sch_test): Cast enum bit to unsigned short int for pcc
+       compatibility.
+       
 2001-02-18  lars brinkhoff  <lars@nocrew.org>
 
        * dis-asm.h: Add PDP-11 target.

diff --git a/include/safe-ctype.h b/include/safe-ctype.h
index d5fc649051a3c10ed62acfe0de16f4dc3be3d968..ccacda5b31bcda2619eba0afeeff30bde95213f9 100644 (file)
--- a/include/safe-ctype.h
+++ b/include/safe-ctype.h
@@ -1,6 +1,6 @@
 /* <ctype.h> replacement macros.
 
-   Copyright (C) 2000 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2001 Free Software Foundation, Inc.
    Contributed by Zack Weinberg <zackw@stanford.edu>.
 
 This file is part of the libiberty library.
@@ -69,7 +69,7 @@ enum {
 /* Character classification.  */
 extern const unsigned short _sch_istable[256];
 
-#define _sch_test(c, bit) (_sch_istable[(c) & 0xff] & (bit))
+#define _sch_test(c, bit) (_sch_istable[(c) & 0xff] & (unsigned short)(bit))
 
 #define ISALPHA(c)  _sch_test(c, _sch_isalpha)
 #define ISALNUM(c)  _sch_test(c, _sch_isalnum)