From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wi0-f171.google.com (mail-wi0-f171.google.com [209.85.212.171]) by dpdk.org (Postfix) with ESMTP id A0D6C7F38 for ; Sat, 22 Nov 2014 22:33:40 +0100 (CET) Received: by mail-wi0-f171.google.com with SMTP id bs8so2387455wib.4 for ; Sat, 22 Nov 2014 13:44:21 -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:subject:date:message-id:in-reply-to :references; bh=/Ngj8uYDa9LO+GKLkpd5wJ38K+9vikVpQI1ca0VPLNA=; b=D7fmv6fKOwwsTI3gjwEMopJLDWX8n3OnalN8CYmBP7zhkwlAhg2PMKghIt7FOQxKx0 jROIO7KK3oCLKh6l6ywH5DP9CwR359aYSb/S325i19wTYpsIVbKwoneiE8YBGlrBLdzJ UAN3WVB3/oM5DC8rzBmo9Tq/gdaazyyYR68SPH7ePraoQ6HE8NB9JV/C8KmUyzD2URHv WV6rc3KJNlNKafuyvz+RkbEYQaMwnPhq5PvQ6/jIzlUGk/lkPvLl/JDeqs3gUlTkjTqk 1VUL6zaxzNXm9Xr8WXq2K0HeHcc2qdIJ6e/PRPBSo+QDPpKrLaU5V5R6u0LOhPcHbasK +LTg== X-Gm-Message-State: ALoCoQkoCF8SWnYiZURYJrFiIlDjTEbxNLcBsXNO6fCqcbc+PY1aRTIclBd+1ci5aQ2nUSO9mBdF X-Received: by 10.180.99.105 with SMTP id ep9mr8666046wib.82.1416692661097; Sat, 22 Nov 2014 13:44:21 -0800 (PST) Received: from localhost.localdomain (136-92-190-109.dsl.ovh.fr. [109.190.92.136]) by mx.google.com with ESMTPSA id cz3sm13724087wjb.23.2014.11.22.13.44.19 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 22 Nov 2014 13:44:20 -0800 (PST) From: Thomas Monjalon To: dev@dpdk.org Date: Sat, 22 Nov 2014 22:43:35 +0100 Message-Id: <1416692622-28886-4-git-send-email-thomas.monjalon@6wind.com> X-Mailer: git-send-email 2.1.3 In-Reply-To: <1416692622-28886-1-git-send-email-thomas.monjalon@6wind.com> References: <1416692622-28886-1-git-send-email-thomas.monjalon@6wind.com> Subject: [dpdk-dev] [PATCH 03/10] eal: fix header guards 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: Sat, 22 Nov 2014 21:33:41 -0000 Some guards are missing or have a wrong name. Others have LINUXAPP in their name but are now common. Signed-off-by: Thomas Monjalon --- lib/librte_eal/common/eal_filesystem.h | 6 +++--- lib/librte_eal/common/eal_hugepages.h | 6 +++--- lib/librte_eal/common/eal_internal_cfg.h | 4 ++-- lib/librte_eal/common/eal_options.h | 4 ++++ lib/librte_eal/common/eal_thread.h | 6 +++--- 5 files changed, 15 insertions(+), 11 deletions(-) diff --git a/lib/librte_eal/common/eal_filesystem.h b/lib/librte_eal/common/eal_filesystem.h index ce442c9..fdb4a70 100644 --- a/lib/librte_eal/common/eal_filesystem.h +++ b/lib/librte_eal/common/eal_filesystem.h @@ -37,8 +37,8 @@ * on the filesystem for Linux, that are used by the Linux EAL. */ -#ifndef _EAL_LINUXAPP_FILESYSTEM_H -#define _EAL_LINUXAPP_FILESYSTEM_H +#ifndef EAL_FILESYSTEM_H +#define EAL_FILESYSTEM_H /** Path of rte config file. */ #define RUNTIME_CONFIG_FMT "%s/.%s_config" @@ -115,4 +115,4 @@ eal_get_hugefile_temp_path(char *buffer, size_t buflen, const char *hugedir, int * Used to read information from files on /sys */ int eal_parse_sysfs_value(const char *filename, unsigned long *val); -#endif /* _EAL_LINUXAPP_FILESYSTEM_H */ +#endif /* EAL_FILESYSTEM_H */ diff --git a/lib/librte_eal/common/eal_hugepages.h b/lib/librte_eal/common/eal_hugepages.h index 51e090b..38edac0 100644 --- a/lib/librte_eal/common/eal_hugepages.h +++ b/lib/librte_eal/common/eal_hugepages.h @@ -31,8 +31,8 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef RTE_LINUXAPP_HUGEPAGES_H_ -#define RTE_LINUXAPP_HUGEPAGES_H_ +#ifndef EAL_HUGEPAGES_H +#define EAL_HUGEPAGES_H #include #include @@ -64,4 +64,4 @@ struct hugepage_file { */ int eal_hugepage_info_init(void); -#endif /* EAL_HUGEPAGES_H_ */ +#endif /* EAL_HUGEPAGES_H */ diff --git a/lib/librte_eal/common/eal_internal_cfg.h b/lib/librte_eal/common/eal_internal_cfg.h index 8749390..19c84e7 100644 --- a/lib/librte_eal/common/eal_internal_cfg.h +++ b/lib/librte_eal/common/eal_internal_cfg.h @@ -36,8 +36,8 @@ * Holds the structures for the eal internal configuration */ -#ifndef _EAL_LINUXAPP_INTERNAL_CFG -#define _EAL_LINUXAPP_INTERNAL_CFG +#ifndef EAL_INTERNAL_CFG_H +#define EAL_INTERNAL_CFG_H #include #include diff --git a/lib/librte_eal/common/eal_options.h b/lib/librte_eal/common/eal_options.h index 22819ec..7a08507 100644 --- a/lib/librte_eal/common/eal_options.h +++ b/lib/librte_eal/common/eal_options.h @@ -30,6 +30,8 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#ifndef EAL_OPTIONS_H +#define EAL_OPTIONS_H enum { /* long options mapped to a short option */ @@ -82,3 +84,5 @@ extern const struct option eal_long_options[]; int eal_parse_common_option(int opt, const char *argv, struct internal_config *conf); void eal_common_usage(void); + +#endif /* EAL_OPTIONS_H */ diff --git a/lib/librte_eal/common/eal_thread.h b/lib/librte_eal/common/eal_thread.h index d029ad3..b53b84d 100644 --- a/lib/librte_eal/common/eal_thread.h +++ b/lib/librte_eal/common/eal_thread.h @@ -31,8 +31,8 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _EAL_LINUXAPP_THREAD_H_ -#define _EAL_LINUXAPP_THREAD_H_ +#ifndef EAL_THREAD_H +#define EAL_THREAD_H /** * basic loop of thread, called for each thread by eal_init(). @@ -50,4 +50,4 @@ __attribute__((noreturn)) void *eal_thread_loop(void *arg); */ void eal_thread_init_master(unsigned lcore_id); -#endif /* _EAL_LINUXAPP_PRIVATE_H_ */ +#endif /* EAL_THREAD_H */ -- 2.1.3