From 18cd62b7fbaaa6a63f017231314b2c9a81b55010 Mon Sep 17 00:00:00 2001 From: Jeff Johnston Date: Thu, 7 Nov 2002 00:44:31 +0000 Subject: [PATCH] 2002-11-06 Kazuhiro Fujieda * libc/include/wchar.h: Use _{BEGIN,END}_STD_C instead of extern "C". * libc/include/wctype.h: Ditto. --- newlib/ChangeLog | 5 +++++ newlib/libc/include/wchar.h | 8 ++------ newlib/libc/include/wctype.h | 8 ++------ 3 files changed, 9 insertions(+), 12 deletions(-) diff --git a/newlib/ChangeLog b/newlib/ChangeLog index 98ffece47..7b3c0ad97 100644 --- a/newlib/ChangeLog +++ b/newlib/ChangeLog @@ -1,3 +1,8 @@ +2002-11-06 Kazuhiro Fujieda + + * libc/include/wchar.h: Use _{BEGIN,END}_STD_C instead of extern "C". + * libc/include/wctype.h: Ditto. + 2002-11-04 Jeff Johnston * libc/include/wchar.h: Add extern "C" specifier if C++. diff --git a/newlib/libc/include/wchar.h b/newlib/libc/include/wchar.h index 2c5fd0ef7..736b09cb1 100644 --- a/newlib/libc/include/wchar.h +++ b/newlib/libc/include/wchar.h @@ -31,9 +31,7 @@ #endif #endif -#ifdef __cplusplus -extern "C" { -#endif +_BEGIN_STD_C #ifndef _MBSTATE_T #define _MBSTATE_T @@ -69,8 +67,6 @@ wchar_t *_EXFUN(wmemcpy, (wchar_t * , const wchar_t * , size_t)); wchar_t *_EXFUN(wmemmove, (wchar_t *, const wchar_t *, size_t)); wchar_t *_EXFUN(wmemset, (wchar_t *, wchar_t, size_t)); -#ifdef __cplusplus -} -#endif +_END_STD_C #endif /* _WCHAR_H_ */ diff --git a/newlib/libc/include/wctype.h b/newlib/libc/include/wctype.h index 15aec00e3..c72c9decf 100644 --- a/newlib/libc/include/wctype.h +++ b/newlib/libc/include/wctype.h @@ -11,9 +11,7 @@ # define WEOF ((wint_t)-1) #endif -#ifdef __cplusplus -extern "C" { -#endif +_BEGIN_STD_C #ifndef _WCTYPE_T #define _WCTYPE_T @@ -44,8 +42,6 @@ wint_t _EXFUN(towlower, (wint_t)); wctrans_t _EXFUN(wctrans, (const char *)); wctype_t _EXFUN(wctype, (const char *)); -#ifdef __cplusplus -} -#endif +_END_STD_C #endif /* _WCTYPE_H_ */