From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wg0-f53.google.com (mail-wg0-f53.google.com [74.125.82.53]) by dpdk.org (Postfix) with ESMTP id 185634BFE for ; Wed, 20 Mar 2013 17:08:00 +0100 (CET) Received: by mail-wg0-f53.google.com with SMTP id eg6so1502859wgb.20 for ; Wed, 20 Mar 2013 09:07:02 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:from:to:subject:date:message-id:x-mailer:in-reply-to :references:in-reply-to:references:x-gm-message-state; bh=UogvmAYlIaMhmOmbjN+znrI9DUxV4W4uDX0CJmCZ8C0=; b=RogRTmdOcdWEOLInDtXZS9HO8sFxjXv9J1D+uXdjshrOfjTzGOs9FBq8/hiTh/zyky +bPsKWZW1r2HO7rQ9yKTV/Lxx/6nrdIJkdhhwYD9YSytRb2DoGTaztd7g5G38AXpvT9g StuPHMwj0QRSLsv7y1ytgQW+BRZVH4CCEUcZ4xX8AqNvROHj+CMcGXy7cw5C21yGBiAz j2oBOOmMYsyfTR5d3eZiqAqkFm5G80Tb0t3a+AxBqyIKLBxbs74TKJjEGyRHmeBY4DX/ w0xNknkmrfNgrFe4kcu8nWF05i9nh7dT5tXS4UtpGFeRYaA8ALlHw8n/+9ORQ0x3Hvi6 M6Ug== X-Received: by 10.180.72.148 with SMTP id d20mr4327472wiv.31.1363795622187; Wed, 20 Mar 2013 09:07:02 -0700 (PDT) Received: from 6wind.com (6wind.net2.nerim.net. [213.41.180.237]) by mx.google.com with ESMTPS id o8sm7710893wix.7.2013.03.20.09.06.59 (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 20 Mar 2013 09:07:01 -0700 (PDT) Received: by 6wind.com (sSMTP sendmail emulation); Wed, 20 Mar 2013 17:06:59 +0100 From: Thomas Monjalon To: dev@dpdk.org Date: Wed, 20 Mar 2013 17:05:02 +0100 Message-Id: <7ce22ab34f1a997034f2aee12547acd78860ecea.1363795499.git.thomas.monjalon@6wind.com> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: References: In-Reply-To: References: X-Gm-Message-State: ALoCoQkjkNyzLJkvGpmX6U/Gm88UbYWoon0+GVCIbsL3vpb4MNT933EIwW+h+1JIud5LbbCR+/eh Subject: [dpdk-dev] [PATCH 14/22] lib: fix non-C99 macros definitions in exported headers X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 20 Mar 2013 16:08:01 -0000 From: Adrien Mazarguil The original definitions prevent external programs/libraries from compiling without warnings when using these headers and -std=gnu99 (relaxed C99 mode). Acked-by: Ivan Boule Acked-by: Damien Millescamps Signed-off-by: Adrien Mazarguil --- lib/librte_cmdline/cmdline_cirbuf.h | 5 +++-- lib/librte_eal/common/include/rte_debug.h | 3 ++- lib/librte_eal/common/include/rte_log.h | 15 +++++++-------- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/lib/librte_cmdline/cmdline_cirbuf.h b/lib/librte_cmdline/cmdline_cirbuf.h index f934292..36b04ec 100644 --- a/lib/librte_cmdline/cmdline_cirbuf.h +++ b/lib/librte_cmdline/cmdline_cirbuf.h @@ -81,9 +81,10 @@ struct cirbuf { /* #define CIRBUF_DEBUG */ #ifdef CIRBUF_DEBUG -#define dprintf(fmt, ...) printf("line %3.3d - " fmt, __LINE__, ##__VA_ARGS__) +#define dprintf_(fmt, ...) printf("line %3.3d - " fmt "%.0s", __LINE__, __VA_ARGS__) +#define dprintf(...) dprintf_(__VA_ARGS__, "dummy") #else -#define dprintf(args...) do {} while(0) +#define dprintf(...) (void)0 #endif diff --git a/lib/librte_eal/common/include/rte_debug.h b/lib/librte_eal/common/include/rte_debug.h index 451220e..1936dde 100644 --- a/lib/librte_eal/common/include/rte_debug.h +++ b/lib/librte_eal/common/include/rte_debug.h @@ -77,7 +77,8 @@ void rte_dump_registers(void); * @param args * The variable list of arguments. */ -#define rte_panic(format, args...) __rte_panic(__func__, format, ## args) +#define rte_panic_(func, format, ...) __rte_panic(func, format "%.0s", __VA_ARGS__) +#define rte_panic(...) rte_panic_(__func__, __VA_ARGS__, "dummy") /* * Provide notification of a critical non-recoverable error and stop. diff --git a/lib/librte_eal/common/include/rte_log.h b/lib/librte_eal/common/include/rte_log.h index d361130..9a17730 100644 --- a/lib/librte_eal/common/include/rte_log.h +++ b/lib/librte_eal/common/include/rte_log.h @@ -274,14 +274,13 @@ int rte_vlog(uint32_t level, uint32_t logtype, const char *format, va_list ap); * - 0: Success. * - Negative on error. */ -#define RTE_LOG(l, t, fmt, args...) ({ \ - if ((RTE_LOG_##l <= RTE_LOG_LEVEL) && \ - (RTE_LOG_##l <= rte_logs.level) && \ - (RTE_LOGTYPE_##t & rte_logs.type)) { \ - rte_log(RTE_LOG_##l, RTE_LOGTYPE_##t, \ - #t ": " fmt, ## args); \ - } \ -}) +#define RTE_LOG(l, t, ...) \ + (((RTE_LOG_ ## l <= RTE_LOG_LEVEL) && \ + (RTE_LOG_ ## l <= rte_logs.level) && \ + (RTE_LOGTYPE_ ## t & rte_logs.type)) ? \ + rte_log(RTE_LOG_ ## l, \ + RTE_LOGTYPE_ ## t, # t ": " __VA_ARGS__) : \ + 0) #ifdef __cplusplus } -- 1.7.2.5