From 68dea338192334c0b61dec2e910e1584ef08522f Mon Sep 17 00:00:00 2001 From: Danny Smith Date: Tue, 7 Jan 2003 21:05:13 +0000 Subject: [PATCH] * include/ctype.h (__isascii): Don't cast arg to unsigned. (iswascii): Likewise. Correct mask. * include/wctype.h (iswascii): Don't cast arg to unsigned. Correct mask --- winsup/mingw/ChangeLog | 7 +++++++ winsup/mingw/include/ctype.h | 4 ++-- winsup/mingw/include/wctype.h | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/winsup/mingw/ChangeLog b/winsup/mingw/ChangeLog index 269dbe98f..4b8fb8924 100644 --- a/winsup/mingw/ChangeLog +++ b/winsup/mingw/ChangeLog @@ -1,3 +1,10 @@ +2003-01-07 Danny Smith + + * include/ctype.h (__isascii): Don't cast arg to unsigned. + (iswascii): Likewise. Correct mask. + * include/wctype.h (iswascii): Don't cast arg to unsigned. + Correct mask + 2003-01-03 Danny Smith * include/stdlib.h (_osver, _winver, _winmajor, diff --git a/winsup/mingw/include/ctype.h b/winsup/mingw/include/ctype.h index 3e553cc5c..fcbb31d77 100644 --- a/winsup/mingw/include/ctype.h +++ b/winsup/mingw/include/ctype.h @@ -212,7 +212,7 @@ int isleadbyte (int); #define __WCTYPE_INLINES_DEFINED extern __inline__ int iswalnum(wint_t wc) {return (iswctype(wc,_ALPHA|_DIGIT));} extern __inline__ int iswalpha(wint_t wc) {return (iswctype(wc,_ALPHA));} -extern __inline__ int iswascii(wint_t wc) {return (((unsigned)wc & 0x7F) ==0);} +extern __inline__ int iswascii(wint_t wc) {return ((wc & ~0x7F) ==0);} extern __inline__ int iswcntrl(wint_t wc) {return (iswctype(wc,_CONTROL));} extern __inline__ int iswdigit(wint_t wc) {return (iswctype(wc,_DIGIT));} extern __inline__ int iswgraph(wint_t wc) {return (iswctype(wc,_PUNCT|_ALPHA|_DIGIT));} @@ -232,7 +232,7 @@ int __iscsymf (int); /* Valid first character in C symbol */ int __iscsym (int); /* Valid character in C symbol (after first) */ #ifndef __NO_CTYPE_INLINES -extern __inline__ int __isascii(int c) {return (((unsigned)c & ~0x7F) == 0);} +extern __inline__ int __isascii(int c) {return ((c & ~0x7F) == 0);} extern __inline__ int __toascii(int c) {return (c & 0x7F);} extern __inline__ int __iscsymf(int c) {return (isalpha(c) || (c == '_'));} extern __inline__ int __iscsym(int c) {return (isalnum(c) || (c == '_'));} diff --git a/winsup/mingw/include/wctype.h b/winsup/mingw/include/wctype.h index f39ef6496..858981b69 100644 --- a/winsup/mingw/include/wctype.h +++ b/winsup/mingw/include/wctype.h @@ -112,7 +112,7 @@ extern unsigned short** _imp___ctype; #define __WCTYPE_INLINES_DEFINED extern __inline__ int iswalnum(wint_t wc) {return (iswctype(wc,_ALPHA|_DIGIT));} extern __inline__ int iswalpha(wint_t wc) {return (iswctype(wc,_ALPHA));} -extern __inline__ int iswascii(wint_t wc) {return (((unsigned)wc & 0x7F) ==0);} +extern __inline__ int iswascii(wint_t wc) {return ((wc & ~0x7F) ==0);} extern __inline__ int iswcntrl(wint_t wc) {return (iswctype(wc,_CONTROL));} extern __inline__ int iswdigit(wint_t wc) {return (iswctype(wc,_DIGIT));} extern __inline__ int iswgraph(wint_t wc) {return (iswctype(wc,_PUNCT|_ALPHA|_DIGIT));}