From 25842b68c79e1ab640b133db6520a8c0a2a458e8 Mon Sep 17 00:00:00 2001 From: Jeff Johnston Date: Mon, 11 Jun 2001 21:51:41 +0000 Subject: [PATCH] 2001-06-11 Danny Smith * /libc/include/ctype.h (is* and to* macros): Do not define if C++. --- newlib/ChangeLog | 4 ++++ newlib/libc/include/ctype.h | 2 ++ 2 files changed, 6 insertions(+) diff --git a/newlib/ChangeLog b/newlib/ChangeLog index c568283c0..e257e42c5 100644 --- a/newlib/ChangeLog +++ b/newlib/ChangeLog @@ -1,3 +1,7 @@ +2001-06-11 Danny Smith + + * /libc/include/ctype.h (is* and to* macros): Do not define if C++. + 2001-06-11 Egor Duda * libc/ctype/ctype_.c: When compiled with gcc on platforms diff --git a/newlib/libc/include/ctype.h b/newlib/libc/include/ctype.h index 624cb1c6f..18dd02f70 100644 --- a/newlib/libc/include/ctype.h +++ b/newlib/libc/include/ctype.h @@ -38,6 +38,7 @@ int _EXFUN(_toupper, (int __c)); extern __IMPORT _CONST char _ctype_[]; +#ifndef __cplusplus #define isalpha(c) ((_ctype_+1)[(unsigned)(c)]&(_U|_L)) #define isupper(c) ((_ctype_+1)[(unsigned)(c)]&_U) #define islower(c) ((_ctype_+1)[(unsigned)(c)]&_L) @@ -57,6 +58,7 @@ extern __IMPORT _CONST char _ctype_[]; # define tolower(c) \ __extension__ ({ int __x = (c); isupper(__x) ? (__x - 'A' + 'a') : __x;}) #endif +#endif /* !__cplusplus */ #ifndef __STRICT_ANSI__ #define isascii(c) ((unsigned)(c)<=0177)