update from main arhive 970119

[thirdparty/glibc.git] / ctype / ctype.h

diff --git a/ctype/ctype.h b/ctype/ctype.h
index c9129f08ec82c144163c7d5c60ac165e03d49e99..64ca26e04f10ac82ffdbe51eb6a4fd76ebab529f 100644 (file)
--- a/ctype/ctype.h
+++ b/ctype/ctype.h
@@ -1,23 +1,23 @@
-/* Copyright (C) 1991, 1992, 1993, 1995 Free Software Foundation, Inc.
-This file is part of the GNU C Library.
+/* Copyright (C) 1991, 92, 93, 95, 96 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
 
-The GNU C Library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Library General Public License as
-published by the Free Software Foundation; either version 2 of the
-License, or (at your option) any later version.
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
 
-The GNU C Library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-Library General Public License for more details.
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
 
-You should have received a copy of the GNU Library General Public
-License along with the GNU C Library; see the file COPYING.LIB.  If
-not, write to the, 1992 Free Software Foundation, Inc., 675 Mass Ave,
-Cambridge, MA 02139, USA.  */
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
 
 /*
- *     ANSI Standard 4.3: CHARACTER HANDLING   <ctype.h>
+ *     ISO C Standard 4.3: CHARACTER HANDLING  <ctype.h>
  */
 
 #ifndef        _CTYPE_H
@@ -27,6 +27,7 @@ Cambridge, MA 02139, USA.  */
 
 __BEGIN_DECLS
 
+#ifndef _ISbit
 /* These are all the characteristics of characters.
    If there get to be more than 16 distinct characteristics,
    many things must be changed that use `unsigned short int's.
@@ -39,7 +40,7 @@ __BEGIN_DECLS
 #if __BYTE_ORDER == __BIG_ENDIAN
 #define _ISbit(bit)    (1 << bit)
 #else /* __BYTE_ORDER == __LITTLE_ENDIAN */
-#define _ISbit(bit)    ((1 << bit) << (bit < 8 ? 8 : -8))
+#define _ISbit(bit)    (bit < 8 ? ((1 << bit) << 8) : ((1 << bit) >> 8))
 #endif
 
 enum
@@ -55,22 +56,21 @@ enum
   _ISblank = _ISbit (8),       /* Blank (usually SPC and TAB).  */
   _IScntrl = _ISbit (9),       /* Control character.  */
   _ISpunct = _ISbit (10),      /* Punctuation.  */
-
-  /* The following are defined in POSIX.2 as being combinations of the
-     classes above.  */
-  _ISalnum = _ISalpha | _ISdigit       /* Alphanumeric.  */
+  _ISalnum = _ISbit (11)       /* Alphanumeric.  */
 };
+#endif /* ! _ISbit  */
 
 /* These are defined in ctype-info.c.
    The declarations here must match those in localeinfo.h.
 
    These point into arrays of 384, so they can be indexed by any `unsigned
    char' value [0,255]; by EOF (-1); or by any `signed char' value
-   [-128,-1).  ANSI requires that the ctype functions work for `unsigned
+   [-128,-1).  ISO C requires that the ctype functions work for `unsigned
    char' values and for EOF; we also support negative `signed char' values
    for broken old programs.  The case conversion arrays are of `int's
    rather than `unsigned char's because tolower (EOF) must be EOF, which
-   doesn't fit into an `unsigned char'.  */
+   doesn't fit into an `unsigned char'.  But today more important is that
+   the arrays are also used for multi-byte character sets.  */
 extern __const unsigned short int *__ctype_b;  /* Characteristics.  */
 extern __const int *__ctype_tolower; /* Case conversions.  */
 extern __const int *__ctype_toupper; /* Case conversions.  */
@@ -78,8 +78,8 @@ extern __const int *__ctype_toupper; /* Case conversions.  */
 #define        __isctype(c, type) \
   (__ctype_b[(int) (c)] & (unsigned short int) type)
 
-#define        __isascii(c)    (((c) & (1 << 7)) == 0) /* If high bit is set.  */
-#define        __toascii(c)    ((c) & 0x7f) /* Mask off high bit.  */
+#define        __isascii(c)    (((c) & ~0x7f) == 0)    /* If C is a 7 bit value.  */
+#define        __toascii(c)    ((c) & 0x7f)            /* Mask off high bits.  */
 
 #define        __tolower(c)    ((int) __ctype_tolower[(int) (c)])
 #define        __toupper(c)    ((int) __ctype_toupper[(int) (c)])
@@ -114,7 +114,7 @@ extern int tolower __P ((int __c));
 extern int toupper __P ((int __c));
 
 
-#if defined(__USE_SVID) || defined(__USE_MISC)
+#if defined(__USE_SVID) || defined(__USE_MISC) || defined(__USE_XOPEN)
 
 /* Return nonzero iff C is in the ASCII set
    (i.e., is no more than 7 bits wide).  */
@@ -126,7 +126,7 @@ extern int toascii __P ((int __c));
 
 #endif /* Use SVID or use misc.  */
 
-#ifdef __USE_SVID
+#if defined(__USE_SVID) || defined(__USE_MISC) || defined(__USE_XOPEN)
 /* These are the same as `toupper' and `tolower'.  */
 __exctype (_toupper);
 __exctype (_tolower);
@@ -152,7 +152,7 @@ __exctype (_tolower);
 #define        tolower(c)      __tolower(c)
 #define        toupper(c)      __toupper(c)
 
-#if defined(__USE_SVID) || defined(__USE_MISC)
+#if defined(__USE_SVID) || defined(__USE_MISC) || defined(__USE_XOPEN)
 #define        isascii(c)      __isascii(c)
 #define        toascii(c)      __toascii(c)
 #endif