From 70a4a3ef141e8e5f21549669fc4f67ae75d150f1 Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Sat, 23 Jan 2010 16:47:54 -0500 Subject: [PATCH] Remove a needless include of rpc_compat.h Nothing in evrpc.c was using rpc_compat.h, so it's best to take it out, especially since it polluted our build process with GCC variadic macros. While we're at it, this patch puts an extra restriction on when the variadic macros in rpc_compat.h are defined. Not only must GCC be the compiler, but GCC must not be running in -ansi mode. --- evrpc.c | 1 - include/event2/rpc_compat.h | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/evrpc.c b/evrpc.c index e05972c3..8600297b 100644 --- a/evrpc.c +++ b/evrpc.c @@ -56,7 +56,6 @@ #include "event2/event_struct.h" #include "event2/rpc.h" #include "event2/rpc_struct.h" -#include "event2/rpc_compat.h" #include "evrpc-internal.h" #include "event2/http.h" #include "event2/buffer.h" diff --git a/include/event2/rpc_compat.h b/include/event2/rpc_compat.h index 5711efa7..5d59ad1b 100644 --- a/include/event2/rpc_compat.h +++ b/include/event2/rpc_compat.h @@ -39,7 +39,7 @@ extern "C" { #endif /** backwards compatible accessors that work only with gcc */ -#ifdef __GNUC__ +#if defined(__GNUC__) && !defined(__STRICT_ANSI__) #undef EVTAG_ASSIGN #undef EVTAG_GET