X-Authentication-Warning: delorie.com: mail set sender to djgpp-workers-bounces using -f Date: Sun, 26 Oct 2003 19:49:19 +0000 From: "Richard Dawe" Sender: rich AT phekda DOT freeserve DOT co DOT uk To: djgpp-workers AT delorie DOT com X-Mailer: Emacs 21.3.50 (via feedmail 8.3.emacs20_6 I) and Blat ver 1.8.6 Subject: Clash between math.h and ieeefp.h, revision 2 [PATCH] Message-Id: Reply-To: djgpp-workers AT delorie DOT com Hello. Here's another try at fixing the clash between math.h and ieeefp.h. As suggested by Eli, we protect the function name by enclosing it in brackets. I modified the macros in . Patch below. OK to commit? Bye, Rich =] Index: include/sys/cdefs.h =================================================================== RCS file: /cvs/djgpp/djgpp/include/sys/cdefs.h,v retrieving revision 1.2 diff -p -u -3 -r1.2 cdefs.h --- include/sys/cdefs.h 25 Jul 1998 19:09:14 -0000 1.2 +++ include/sys/cdefs.h 26 Oct 2003 11:38:48 -0000 @@ -1,3 +1,4 @@ +/* Copyright (C) 2003 DJ Delorie, see COPYING.DJ for details */ /* Copyright (C) 1998 DJ Delorie, see COPYING.DJ for details */ /* Copyright (C) 1994 DJ Delorie, see COPYING.DJ for details */ #undef __P @@ -14,9 +15,9 @@ #define _SIGNED signed #define _DOTS , ... #define _VOID void -#define _EXFUN(name, proto) name proto -#define _DEFUN(name, arglist, args) name(args) -#define _DEFUN_VOID(name) name(_NOARGS) +#define _EXFUN(name, proto) (name) proto +#define _DEFUN(name, arglist, args) (name)(args) +#define _DEFUN_VOID(name) (name)(_NOARGS) #define _CAST_VOID (void) #ifndef _LONG_DOUBLE #define _LONG_DOUBLE long double