From 8a423cb3d62534f6663b66ae42045fd984d36d63 Mon Sep 17 00:00:00 2001 From: DJ Delorie Date: Mon, 27 Aug 2001 20:05:03 +0000 Subject: merge from gcc --- include/ChangeLog | 4 ++++ include/ansidecl.h | 8 ++++---- 2 files changed, 8 insertions(+), 4 deletions(-) (limited to 'include') diff --git a/include/ChangeLog b/include/ChangeLog index 5c76a7b..640b058 100644 --- a/include/ChangeLog +++ b/include/ChangeLog @@ -1,3 +1,7 @@ +2001-08-27 Kaveh R. Ghazi + + * ansidecl.h (VA_OPEN, VA_CLOSE): Allow multiple uses. + 2001-08-25 Nick Clifton * bfdlink.h (struct bfd_link_info): Change 'spare_dynamic_tags' to diff --git a/include/ansidecl.h b/include/ansidecl.h index b7c4c40..4c63fa6 100644 --- a/include/ansidecl.h +++ b/include/ansidecl.h @@ -152,8 +152,8 @@ So instead we use the macro below and test it against specific values. */ /* "struct Qdmy" swallows the semicolon after VA_OPEN/VA_FIXEDARG's use without inhibiting further decls and without declaring an actual variable. */ -#define VA_OPEN(AP, VAR) va_list AP; va_start(AP, VAR); { struct Qdmy -#define VA_CLOSE(AP) } va_end(AP) +#define VA_OPEN(AP, VAR) { va_list AP; va_start(AP, VAR); { struct Qdmy +#define VA_CLOSE(AP) } va_end(AP); } #define VA_FIXEDARG(AP, T, N) struct Qdmy #undef const @@ -199,8 +199,8 @@ So instead we use the macro below and test it against specific values. */ #define VPARAMS(args) (va_alist) va_dcl #define VA_START(va_list, var) va_start(va_list) -#define VA_OPEN(AP, VAR) va_list AP; va_start(AP); { struct Qdmy -#define VA_CLOSE(AP) } va_end(AP) +#define VA_OPEN(AP, VAR) { va_list AP; va_start(AP); { struct Qdmy +#define VA_CLOSE(AP) } va_end(AP); } #define VA_FIXEDARG(AP, TYPE, NAME) TYPE NAME = va_arg(AP, TYPE) /* some systems define these in header files for non-ansi mode */ -- cgit v1.1