diff options
| author | phantom <phantom@FreeBSD.org> | 1999-12-17 15:12:21 +0000 |
|---|---|---|
| committer | phantom <phantom@FreeBSD.org> | 1999-12-17 15:12:21 +0000 |
| commit | 37b2004d094765ca1230841e342a5b2c1c969eb8 (patch) | |
| tree | 32b4acccdf15c4a6809da1f7227313b33953c9ba /include | |
| parent | 47918de226d94967bf9aad66bdf0a62fae171cb6 (diff) | |
| download | FreeBSD-src-37b2004d094765ca1230841e342a5b2c1c969eb8.zip FreeBSD-src-37b2004d094765ca1230841e342a5b2c1c969eb8.tar.gz | |
Back up following macros by functions: ishexnumber, isideogram, isnumber,
isphonogram, isrune, isspecial. Fix ordering.
Reviewed by: bde
Diffstat (limited to 'include')
| -rw-r--r-- | include/_ctype.h | 15 | ||||
| -rw-r--r-- | include/ctype.h | 15 |
2 files changed, 20 insertions, 10 deletions
diff --git a/include/_ctype.h b/include/_ctype.h index 33e294c..af15c3a 100644 --- a/include/_ctype.h +++ b/include/_ctype.h @@ -39,6 +39,7 @@ * SUCH DAMAGE. * * @(#)ctype.h 8.4 (Berkeley) 1/21/94 + * $FreeBSD$ */ #ifndef _CTYPE_H_ @@ -81,10 +82,16 @@ int tolower __P((int)); int toupper __P((int)); #if !defined(_ANSI_SOURCE) && !defined(_POSIX_SOURCE) +int digittoint __P((int)); int isascii __P((int)); int isblank __P((int)); +int ishexnumber __P((int)); +int isideogram __P((int)); +int isnumber __P((int)); +int isphonogram __P((int)); +int isrune __P((int)); +int isspecial __P((int)); int toascii __P((int)); -int digittoint __P((int)); #endif __END_DECLS @@ -105,18 +112,16 @@ __END_DECLS #define toupper(c) __toupper(c) #if !defined(_ANSI_SOURCE) && !defined(_POSIX_SOURCE) +#define digittoint(c) __maskrune((c), 0xFF) #define isascii(c) (((c) & ~0x7F) == 0) #define isblank(c) __istype((c), _B) -#define toascii(c) ((c) & 0x7F) -#define digittoint(c) __maskrune((c), 0xFF) - -/* XXX the following macros are not backed up by functions. */ #define ishexnumber(c) __istype((c), _X) #define isideogram(c) __istype((c), _I) #define isnumber(c) __istype((c), _D) #define isphonogram(c) __istype((c), _Q) #define isrune(c) __istype((c), 0xFFFFFF00L) #define isspecial(c) __istype((c), _T) +#define toascii(c) ((c) & 0x7F) #endif /* See comments in <machine/ansi.h> about _BSD_CT_RUNE_T_. */ diff --git a/include/ctype.h b/include/ctype.h index 33e294c..af15c3a 100644 --- a/include/ctype.h +++ b/include/ctype.h @@ -39,6 +39,7 @@ * SUCH DAMAGE. * * @(#)ctype.h 8.4 (Berkeley) 1/21/94 + * $FreeBSD$ */ #ifndef _CTYPE_H_ @@ -81,10 +82,16 @@ int tolower __P((int)); int toupper __P((int)); #if !defined(_ANSI_SOURCE) && !defined(_POSIX_SOURCE) +int digittoint __P((int)); int isascii __P((int)); int isblank __P((int)); +int ishexnumber __P((int)); +int isideogram __P((int)); +int isnumber __P((int)); +int isphonogram __P((int)); +int isrune __P((int)); +int isspecial __P((int)); int toascii __P((int)); -int digittoint __P((int)); #endif __END_DECLS @@ -105,18 +112,16 @@ __END_DECLS #define toupper(c) __toupper(c) #if !defined(_ANSI_SOURCE) && !defined(_POSIX_SOURCE) +#define digittoint(c) __maskrune((c), 0xFF) #define isascii(c) (((c) & ~0x7F) == 0) #define isblank(c) __istype((c), _B) -#define toascii(c) ((c) & 0x7F) -#define digittoint(c) __maskrune((c), 0xFF) - -/* XXX the following macros are not backed up by functions. */ #define ishexnumber(c) __istype((c), _X) #define isideogram(c) __istype((c), _I) #define isnumber(c) __istype((c), _D) #define isphonogram(c) __istype((c), _Q) #define isrune(c) __istype((c), 0xFFFFFF00L) #define isspecial(c) __istype((c), _T) +#define toascii(c) ((c) & 0x7F) #endif /* See comments in <machine/ansi.h> about _BSD_CT_RUNE_T_. */ |
