Print this page
remove support for non-ANSI compilation
| Split |
Close |
| Expand all |
| Collapse all |
--- old/usr/src/head/ctype.h
+++ new/usr/src/head/ctype.h
1 1 /*
2 2 * CDDL HEADER START
3 3 *
4 4 * The contents of this file are subject to the terms of the
5 5 * Common Development and Distribution License, Version 1.0 only
6 6 * (the "License"). You may not use this file except in compliance
7 7 * with the License.
8 8 *
9 9 * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
10 10 * or http://www.opensolaris.org/os/licensing.
11 11 * See the License for the specific language governing permissions
12 12 * and limitations under the License.
13 13 *
14 14 * When distributing Covered Code, include this CDDL HEADER in each
15 15 * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
16 16 * If applicable, add the following below this CDDL HEADER, with the
|
↓ open down ↓ |
16 lines elided |
↑ open up ↑ |
17 17 * fields enclosed by brackets "[]" replaced with your own identifying
18 18 * information: Portions Copyright [yyyy] [name of copyright owner]
19 19 *
20 20 * CDDL HEADER END
21 21 */
22 22 /* Copyright (c) 1988 AT&T */
23 23 /* All Rights Reserved */
24 24
25 25
26 26 /*
27 + * Copyright 2014 Garrett D'Amore <garrett@damore.org>
28 + *
27 29 * Copyright 2004 Sun Microsystems, Inc. All rights reserved.
28 30 * Use is subject to license terms.
29 31 */
30 -/*
31 - * Copyright 2014 Garrett D'Amore <garrett@damore.org>
32 - */
33 32
34 33 #ifndef _CTYPE_H
35 34 #define _CTYPE_H
36 35
37 36 #include <iso/ctype_iso.h>
38 37
39 38 /*
40 39 * Allow global visibility for symbols defined in
41 40 * C++ "std" namespace in <iso/ctype_iso.h>.
42 41 */
43 42 #if __cplusplus >= 199711L
44 43 using std::isalnum;
45 44 using std::isalpha;
46 45 using std::iscntrl;
47 46 using std::isdigit;
48 47 using std::isgraph;
49 48 using std::islower;
50 49 using std::isprint;
51 50 using std::ispunct;
52 51 using std::isspace;
53 52 using std::isupper;
54 53 using std::isxdigit;
55 54 using std::tolower;
|
↓ open down ↓ |
13 lines elided |
↑ open up ↑ |
56 55 using std::toupper;
57 56 #if _cplusplus >= 201103L
58 57 using std::isblank;
59 58 #endif
60 59 #endif
61 60
62 61 #ifdef __cplusplus
63 62 extern "C" {
64 63 #endif
65 64
66 -#if defined(__STDC__)
67 -
68 65 #if defined(__EXTENSIONS__) || \
69 66 ((!defined(_STRICT_STDC) && !defined(_POSIX_C_SOURCE)) || \
70 67 defined(_XOPEN_SOURCE))
71 68
72 69 extern int isascii(int);
73 70 extern int toascii(int);
74 71 extern int _tolower(int);
75 72 extern int _toupper(int);
76 73
77 74 #endif /* defined(__EXTENSIONS__) || ((!defined(_STRICT_STDC) ... */
78 75
79 76 #if !defined(__lint)
80 77
81 78 #if defined(__EXTENSIONS__) || \
82 79 ((!defined(_STRICT_STDC) && !defined(_POSIX_C_SOURCE)) || \
83 80 defined(_XOPEN_SOURCE)) || defined(__XPG4_CHAR_CLASS__)
84 81 #define isascii(c) (!(((int)(c)) & ~0177))
85 82 #define toascii(c) (((int)(c)) & 0177)
86 83 #define _toupper(c) (toupper(c))
87 84 #define _tolower(c) (tolower(c))
88 85
89 86 #endif /* defined(__EXTENSIONS__) || ((!defined(_STRICT_STDC) ... */
90 87
91 88 #endif /* !defined(__lint) */
92 89
93 90 #if defined(_XPG7) || !defined(_STRICT_SYMBOLS)
94 91
95 92 #ifndef _LOCALE_T
96 93 #define _LOCALE_T
97 94 typedef struct _locale *locale_t;
98 95 #endif
99 96
100 97 extern int isalnum_l(int, locale_t);
101 98 extern int isalpha_l(int, locale_t);
102 99 extern int isblank_l(int, locale_t);
103 100 extern int iscntrl_l(int, locale_t);
104 101 extern int isdigit_l(int, locale_t);
|
↓ open down ↓ |
27 lines elided |
↑ open up ↑ |
105 102 extern int isgraph_l(int, locale_t);
106 103 extern int islower_l(int, locale_t);
107 104 extern int isprint_l(int, locale_t);
108 105 extern int ispunct_l(int, locale_t);
109 106 extern int isspace_l(int, locale_t);
110 107 extern int isupper_l(int, locale_t);
111 108 extern int isxdigit_l(int, locale_t);
112 109
113 110 #endif /* defined(_XPG7) || !defined(_STRICT_SYMBOLS) */
114 111
115 -#else /* defined(__STDC__) */
116 -
117 -#if !defined(__lint)
118 -
119 -#define isascii(c) (!(((int)(c)) & ~0177))
120 -#define _toupper(c) (isascii(c) ? __trans_upper[(int)(c)] : toupper(c))
121 -#define _tolower(c) (isascii(c) ? __trans_lower[(int)(c)] : tolower(c))
122 -#define toascii(c) (((int)(c)) & 0177)
123 -
124 -#endif /* !defined(__lint) */
125 -
126 -#endif /* defined(__STDC__) */
127 -
128 112 #ifdef __cplusplus
129 113 }
130 114 #endif
131 115
132 116 #endif /* _CTYPE_H */
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX