make _offset an fpos_t so we can do 64-bit seeks

[unix-history] / usr / src / include / ctype.h

diff --git a/usr/src/include/ctype.h b/usr/src/include/ctype.h
index 99e8242..ca792e0 100644 (file)
--- a/usr/src/include/ctype.h
+++ b/usr/src/include/ctype.h
@@ -2,21 +2,14 @@
  * Copyright (c) 1989 The Regents of the University of California.
  * All rights reserved.
  *
  * Copyright (c) 1989 The Regents of the University of California.
  * All rights reserved.
  *

- * Redistribution and use in source and binary forms are permitted
- * provided that the above copyright notice and this paragraph are
- * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
- * distribution and use acknowledge that the software was developed
- * by the University of California, Berkeley.  The name of the
- * University may not be used to endorse or promote products derived
- * from this software without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ * %sccs.include.redist.c%

  *
  *

- *     @(#)ctype.h     5.1 (Berkeley) %G%
+ *     @(#)ctype.h     5.7 (Berkeley) %G%

  */
 
  */
 

+#ifndef _CTYPE_H_
+#define _CTYPE_H_
+

 #define        _U      0x01
 #define        _L      0x02
 #define        _N      0x04
 #define        _U      0x01
 #define        _L      0x02
 #define        _N      0x04


@@ -26,20 +19,26 @@
 #define        _X      0x40
 #define        _B      0x80
 
 #define        _X      0x40
 #define        _B      0x80
 

-extern char    _ctype_[];
+extern char __ctype[], __maplower[], __mapupper[];
+
+#define        isalnum(c)      ((__ctype + 1)[c] & (_U|_L|_N))
+#define        isalpha(c)      ((__ctype + 1)[c] & (_U|_L))
+#define        iscntrl(c)      ((__ctype + 1)[c] & _C)
+#define        isdigit(c)      ((__ctype + 1)[c] & _N)
+#define        isgraph(c)      ((__ctype + 1)[c] & (_P|_U|_L|_N))
+#define        islower(c)      ((__ctype + 1)[c] & _L)
+#define        isprint(c)      ((__ctype + 1)[c] & (_P|_U|_L|_N|_B))
+#define        ispunct(c)      ((__ctype + 1)[c] & _P)
+#define        isspace(c)      ((__ctype + 1)[c] & _S)
+#define        isupper(c)      ((__ctype + 1)[c] & _U)
+#define        isxdigit(c)     ((__ctype + 1)[c] & (_N|_X))
+#define        tolower(c)      ((__maplower + 1)[c])
+#define        toupper(c)      ((__mapupper + 1)[c])

 
 

-#define        isdigit(c)      ((_ctype_ + 1)[c] & _N)
-#define        islower(c)      ((_ctype_ + 1)[c] & _L)
-#define        isspace(c)      ((_ctype_ + 1)[c] & _S)
-#define        ispunct(c)      ((_ctype_ + 1)[c] & _P)
-#define        isupper(c)      ((_ctype_ + 1)[c] & _U)
-#define        isalpha(c)      ((_ctype_ + 1)[c] & (_U|_L))
-#define        isxdigit(c)     ((_ctype_ + 1)[c] & (_N|_X))
-#define        isalnum(c)      ((_ctype_ + 1)[c] & (_U|_L|_N))
-#define        isprint(c)      ((_ctype_ + 1)[c] & (_P|_U|_L|_N|_B))
-#define        isgraph(c)      ((_ctype_ + 1)[c] & (_P|_U|_L|_N))
-#define        iscntrl(c)      ((_ctype_ + 1)[c] & _C)
-#define        isascii(c)      ((unsigned)(c) <= 0177)
-#define        toupper(c)      ((c) - 'a' + 'A')
-#define        tolower(c)      ((c) - 'A' + 'a')
+#if !defined(_ANSI_SOURCE) && !defined(_POSIX_SOURCE)
+#define        isascii(c)      ((unsigned int)(c) <= 0177)
+#define        isblank(c)      ((c) == '\t' || (c) == ' ')

 #define        toascii(c)      ((c) & 0177)
 #define        toascii(c)      ((c) & 0177)

+#endif
+
+#endif /* !_CTYPE_H_ */