From a6eda2bb662dae98b6b61236da6501a53a1f3794 Mon Sep 17 00:00:00 2001 From: Danny Smith Date: Thu, 3 Oct 2002 20:43:38 +0000 Subject: * include/math.h (__signbit); Remove errant '__' added in last patch. * include/wctype.h: Add missing space before __wc, throughout. (is_wctype): Move into non-ANSI space. --- winsup/mingw/ChangeLog | 7 +++++++ winsup/mingw/include/math.h | 6 +++--- winsup/mingw/include/wctype.h | 33 ++++++++++++++++++--------------- 3 files changed, 28 insertions(+), 18 deletions(-) diff --git a/winsup/mingw/ChangeLog b/winsup/mingw/ChangeLog index e82e87e6c6c..f3840fc29dc 100644 --- a/winsup/mingw/ChangeLog +++ b/winsup/mingw/ChangeLog @@ -1,3 +1,10 @@ +2002-10-03 Danny Smith + + * include/math.h (__signbit); Remove errant '__' added in last + patch. + * include/wctype.h: Add missing space before __wc, throughout. + (is_wctype): Move into non-ANSI space. + 2002-10-02 Danny Smith * include/cytpe.h: Prefix identifiers used as args of inlines diff --git a/winsup/mingw/include/math.h b/winsup/mingw/include/math.h index 3abb189f74f..bf34ce89227 100644 --- a/winsup/mingw/include/math.h +++ b/winsup/mingw/include/math.h @@ -323,18 +323,18 @@ extern __inline__ int __isnanl (long double __x) /* 7.12.3.6 The signbit macro */ extern __inline__ int __signbit (double __x) { unsigned short stw; - __asm__ ( "fxam; fstsw %%a__x;": "=a" (stw) : "t" (__x)); + __asm__ ( "fxam; fstsw %%ax;": "=a" (stw) : "t" (__x)); return stw & 0x0200; } extern __inline__ int __signbitf (float __x) { unsigned short stw; - __asm__ ("fxam; fstsw %%a__x;": "=a" (stw) : "t" (__x)); + __asm__ ("fxam; fstsw %%ax;": "=a" (stw) : "t" (__x)); return stw & 0x0200; } extern __inline__ int __signbitl (long double __x) { unsigned short stw; - __asm__ ("fxam; fstsw %%a__x;": "=a" (stw) : "t" (__x)); + __asm__ ("fxam; fstsw %%ax;": "=a" (stw) : "t" (__x)); return stw & 0x0200; } diff --git a/winsup/mingw/include/wctype.h b/winsup/mingw/include/wctype.h index aa9340c507b..efa2f0ba14e 100644 --- a/winsup/mingw/include/wctype.h +++ b/winsup/mingw/include/wctype.h @@ -67,7 +67,6 @@ int iswalpha(wint_t); int iswascii(wint_t); int iswcntrl(wint_t); int iswctype(wint_t, wctype_t); -int is_wctype(wint_t, wctype_t); /* Obsolete! */ int iswdigit(wint_t); int iswgraph(wint_t); int iswlower(wint_t); @@ -105,26 +104,24 @@ extern unsigned short** _imp___ctype; # endif /* CRTDLL */ #endif /* __DECLSPEC_SUPPORTED */ - #if !(defined(__NO_CTYPE_INLINES) || defined(__WCTYPE_INLINES_DEFINED)) #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 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));} -extern __inline__ int iswlower(wint_t__wc) {return (iswctype(__wc,_LOWER));} -extern __inline__ int iswprint(wint_t__wc) {return (iswctype(__wc,_BLANK|_PUNCT|_ALPHA|_DIGIT));} -extern __inline__ int iswpunct(wint_t__wc) {return (iswctype(__wc,_PUNCT));} -extern __inline__ int iswspace(wint_t__wc) {return (iswctype(__wc,_SPACE));} -extern __inline__ int iswupper(wint_t__wc) {return (iswctype(__wc,_UPPER));} -extern __inline__ int iswxdigit(wint_t__wc) {return (iswctype(__wc,_HEX));} +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 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));} +extern __inline__ int iswlower(wint_t __wc) {return (iswctype(__wc,_LOWER));} +extern __inline__ int iswprint(wint_t __wc) {return (iswctype(__wc,_BLANK|_PUNCT|_ALPHA|_DIGIT));} +extern __inline__ int iswpunct(wint_t __wc) {return (iswctype(__wc,_PUNCT));} +extern __inline__ int iswspace(wint_t __wc) {return (iswctype(__wc,_SPACE));} +extern __inline__ int iswupper(wint_t __wc) {return (iswctype(__wc,_UPPER));} +extern __inline__ int iswxdigit(wint_t __wc) {return (iswctype(__wc,_HEX));} extern __inline__ int isleadbyte(int __c) {return (_pctype[(unsigned char)(__c)] & _LEADBYTE);} #endif /* !(defined(__NO_CTYPE_INLINES) || defined(__WCTYPE_INLINES_DEFINED)) */ - typedef wchar_t wctrans_t; wint_t towctrans(wint_t, wctrans_t); wctrans_t wctrans(const char*); @@ -132,6 +129,12 @@ wctype_t wctype(const char*); __END_CSTD_NAMESPACE +#ifndef __STRICT_ANSI__ +__BEGIN_CGLOBAL_NAMESPACE +int is_wctype(wint_t, __CSTD wctype_t); /* Obsolete! */ +__END_CGLOBAL_NAMESPACE +#endif /* __STRICT_ANSI__ */ + #endif /* Not RC_INVOKED */ #endif /* Not _WCTYPE_H_ */ -- cgit v1.2.1