From abf6a75b428517d9caaf9155212b0b10e0379a99 Mon Sep 17 00:00:00 2001 From: DJ Delorie Date: Tue, 24 May 2005 21:01:33 +0000 Subject: merge from gcc --- libiberty/xstrerror.c | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) (limited to 'libiberty/xstrerror.c') diff --git a/libiberty/xstrerror.c b/libiberty/xstrerror.c index 01f3a7b..2ea2200 100644 --- a/libiberty/xstrerror.c +++ b/libiberty/xstrerror.c @@ -19,15 +19,28 @@ will never return a @code{NULL} pointer. #include "libiberty.h" #ifdef VMS -#include -#if !defined (__STRICT_ANSI__) && !defined (__HIDE_FORBIDDEN_NAMES) +# include +# if !defined (__STRICT_ANSI__) && !defined (__HIDE_FORBIDDEN_NAMES) +# ifdef __cplusplus +extern "C" { +# endif /* __cplusplus */ extern char *strerror (int,...); -#define DONT_DECLARE_STRERROR -#endif -#endif /* VMS */ +# define DONT_DECLARE_STRERROR +# ifdef __cplusplus +} +# endif /* __cplusplus */ +# endif +#endif /* VMS */ + #ifndef DONT_DECLARE_STRERROR +# ifdef __cplusplus +extern "C" { +# endif /* __cplusplus */ extern char *strerror (int); +# ifdef __cplusplus +} +# endif /* __cplusplus */ #endif /* If strerror returns NULL, we'll format the number into a static buffer. */ -- cgit v1.1