From patchwork Fri Nov 7 06:26:20 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Marchand X-Patchwork-Id: 1183 Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [IPv6:::1]) by dpdk.org (Postfix) with ESMTP id 4D6F97EC4; Fri, 7 Nov 2014 07:16:58 +0100 (CET) Received: from mail-wg0-f49.google.com (mail-wg0-f49.google.com [74.125.82.49]) by dpdk.org (Postfix) with ESMTP id 258194A6E for ; Fri, 7 Nov 2014 07:16:56 +0100 (CET) Received: by mail-wg0-f49.google.com with SMTP id x13so2879801wgg.8 for ; Thu, 06 Nov 2014 22:26:26 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=vFvdInNgVA/MCWxUTKmHTnfrVI8zLjMQ8BkLfkGlXlY=; b=WFzkJRyT4sPOOaeeZmZItc+9E62lkwwX+f2tEGO/muXslbZ0bDMrxSsqHaPVqBGLpV 4+QbY7IY8GdlLaapRCa771zHaBeSafF8k8b9pn/53pRS7Fl8+7KGe3XLWbZPTM3exRDA C/sXRlq3+556LA5gvBhWbIeJpUP1y+/1QLzobpsruRTkZxNskOeNBRiwEJRu/emcFtoI t0aYYJ8Tw3A/7Hx6xZ0HhBSZA2vN/h+GtfyEmUAbWNN18BZJePk5TZn0Ab02xf4lHGZR aOgQlBT2r0La+fEPXjxFW04Ot3efaKBf43Z9siRe4ji+ju6wQMlVUUj36A8SdIzZH9es lbbw== X-Gm-Message-State: ALoCoQnZ2yhxIlBOO+bPJ2dwjqDgw5+iZzemX8DaXybUhLFvI/mSbaxPtZwSzakYK02FOhVi9vW8 X-Received: by 10.194.109.226 with SMTP id hv2mr12736736wjb.45.1415341586534; Thu, 06 Nov 2014 22:26:26 -0800 (PST) Received: from alcyon.dev.6wind.com (guy78-3-82-239-227-177.fbx.proxad.net. [82.239.227.177]) by mx.google.com with ESMTPSA id fa7sm10489130wjd.27.2014.11.06.22.26.24 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 06 Nov 2014 22:26:25 -0800 (PST) From: David Marchand To: dev@dpdk.org Date: Fri, 7 Nov 2014 07:26:20 +0100 Message-Id: <1415341580-28210-1-git-send-email-david.marchand@6wind.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: References: Subject: [dpdk-dev] [PATCH] eal: fix C++ compilation issue after headers rework 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: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Following the big headers rework, all C++ stuff has moved to arch-specific headers. The generic headers should not contain this so that this is done only once. There was a remaining #ifdef __cplusplus in "eal: split CPU cycle operation to architecture specific" (fa4001c30ee9). Reported-by: Keunhong Lee Signed-off-by: David Marchand Acked-by: Thomas Monjalon --- lib/librte_eal/common/include/generic/rte_cycles.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/lib/librte_eal/common/include/generic/rte_cycles.h b/lib/librte_eal/common/include/generic/rte_cycles.h index c42b90b..7700f41 100644 --- a/lib/librte_eal/common/include/generic/rte_cycles.h +++ b/lib/librte_eal/common/include/generic/rte_cycles.h @@ -202,8 +202,4 @@ rte_delay_ms(unsigned ms) rte_delay_us(ms * 1000); } -#ifdef __cplusplus -} -#endif - #endif /* _RTE_CYCLES_H_ */