From patchwork Wed Feb 11 07:10:02 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Uvarov X-Patchwork-Id: 44541 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-lb0-f199.google.com (mail-lb0-f199.google.com [209.85.217.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 8125621527 for ; Wed, 11 Feb 2015 07:11:04 +0000 (UTC) Received: by mail-lb0-f199.google.com with SMTP id z11sf986356lbi.2 for ; Tue, 10 Feb 2015 23:11:03 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:date:message-id:in-reply-to :references:subject:precedence:list-id:list-unsubscribe:list-archive :list-post:list-help:list-subscribe:mime-version:content-type :content-transfer-encoding:errors-to:sender:x-original-sender :x-original-authentication-results:mailing-list; bh=7JvkuOiWKV+98DiYaXSixEiUGE2L3/vYi2G6A8siRLE=; b=ZeeCbXPZmPbcymVRzuRueSmFup5TlbZ2EitJ5+FYs/d9DlTK3aHQP7zBBKM4OvfY61 qhYY15b29CvCFNXAGOopNzw4CWwm3dP9vYUBIjoGL0hWSJ+mtXpgtaXoJXInF+2/S2d/ pi9NJL8kB+1GYdOytZG9DpRi8lzGnaZSFC81Cs50aGLgVm60Bm/OUVUYpCPVqHl/xEwE wTB+G1+qFRVG4WRSlEOdkWAUB9cvZAp35NiQLs+e7yTFz2ffGNom7TM7KJs7WrXfoiw+ KLPRzDwoOYK1qLkmcvf/MXEuJkQlSbi2M1CNPa8hqvq/HHU/1bkTaXnsKjsQCLDMrn0u WLeg== X-Gm-Message-State: ALoCoQmNj9N+wDOZuAssSeQKx/Z4hEI/Q7Q9EM/hMaa6UNxtWfAlGNuH91nryIDz+qdPDYQivT1g X-Received: by 10.180.89.194 with SMTP id bq2mr169858wib.4.1423638663271; Tue, 10 Feb 2015 23:11:03 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.22.193 with SMTP id g1ls24345laf.14.gmail; Tue, 10 Feb 2015 23:11:02 -0800 (PST) X-Received: by 10.112.162.226 with SMTP id yd2mr26626639lbb.1.1423638662837; Tue, 10 Feb 2015 23:11:02 -0800 (PST) Received: from mail-la0-f42.google.com (mail-la0-f42.google.com. [209.85.215.42]) by mx.google.com with ESMTPS id rg7si7136688lbb.57.2015.02.10.23.11.02 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 10 Feb 2015 23:11:02 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.42 as permitted sender) client-ip=209.85.215.42; Received: by lams18 with SMTP id s18so1492035lam.11 for ; Tue, 10 Feb 2015 23:11:02 -0800 (PST) X-Received: by 10.112.161.34 with SMTP id xp2mr921071lbb.73.1423638662490; Tue, 10 Feb 2015 23:11:02 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.35.133 with SMTP id h5csp1076663lbj; Tue, 10 Feb 2015 23:11:01 -0800 (PST) X-Received: by 10.224.38.131 with SMTP id b3mr62478331qae.103.1423638660938; Tue, 10 Feb 2015 23:11:00 -0800 (PST) Received: from ip-10-35-177-41.ec2.internal (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTPS id m8si21581688qao.65.2015.02.10.23.10.59 (version=TLSv1 cipher=RC4-SHA bits=128/128); Tue, 10 Feb 2015 23:11:00 -0800 (PST) Received-SPF: none (google.com: lng-odp-bounces@lists.linaro.org does not designate permitted sender hosts) client-ip=54.225.227.206; Received: from localhost ([127.0.0.1] helo=ip-10-35-177-41.ec2.internal) by ip-10-35-177-41.ec2.internal with esmtp (Exim 4.76) (envelope-from ) id 1YLRRq-0001b6-0z; Wed, 11 Feb 2015 07:10:58 +0000 Received: from mail-pa0-f49.google.com ([209.85.220.49]) by ip-10-35-177-41.ec2.internal with esmtp (Exim 4.76) (envelope-from ) id 1YLRRd-0001Xv-Rd for lng-odp@lists.linaro.org; Wed, 11 Feb 2015 07:10:45 +0000 Received: by mail-pa0-f49.google.com with SMTP id fb1so2151282pad.8 for ; Tue, 10 Feb 2015 23:10:40 -0800 (PST) X-Received: by 10.70.140.162 with SMTP id rh2mr44285394pdb.131.1423638640451; Tue, 10 Feb 2015 23:10:40 -0800 (PST) Received: from localhost.localdomain ([210.177.145.249]) by mx.google.com with ESMTPSA id zs8sm21442490pac.9.2015.02.10.23.10.38 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 10 Feb 2015 23:10:39 -0800 (PST) From: Maxim Uvarov To: lng-odp@lists.linaro.org Date: Wed, 11 Feb 2015 10:10:02 +0300 Message-Id: <1423638605-6342-4-git-send-email-maxim.uvarov@linaro.org> X-Mailer: git-send-email 1.8.5.1.163.gd7aced9 In-Reply-To: <1423638605-6342-1-git-send-email-maxim.uvarov@linaro.org> References: <1423638605-6342-1-git-send-email-maxim.uvarov@linaro.org> X-Topics: patch Subject: [lng-odp] [PATCH 3/6] linux-generic: kill version_types.h X-BeenThere: lng-odp@lists.linaro.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , MIME-Version: 1.0 Errors-To: lng-odp-bounces@lists.linaro.org Sender: lng-odp-bounces@lists.linaro.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: maxim.uvarov@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.42 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 Signed-off-by: Maxim Uvarov --- platform/linux-generic/Makefile.am | 3 +-- .../linux-generic/include/odp/plat/version_types.h | 30 ---------------------- platform/linux-generic/include/odp/version.h | 13 +++++++++- platform/linux-generic/odp_version.c | 2 +- 4 files changed, 14 insertions(+), 34 deletions(-) delete mode 100644 platform/linux-generic/include/odp/plat/version_types.h diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index 16adccc..f1580d5 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -61,8 +61,7 @@ odpplatinclude_HEADERS = \ $(top_srcdir)/platform/linux-generic/include/odp/plat/schedule_types.h \ $(top_srcdir)/platform/linux-generic/include/odp/plat/shared_memory_types.h \ $(top_srcdir)/platform/linux-generic/include/odp/plat/strong_types.h \ - $(top_srcdir)/platform/linux-generic/include/odp/plat/timer_types.h \ - $(top_srcdir)/platform/linux-generic/include/odp/plat/version_types.h + $(top_srcdir)/platform/linux-generic/include/odp/plat/timer_types.h odpapiincludedir= $(includedir)/odp/api odpapiinclude_HEADERS = \ diff --git a/platform/linux-generic/include/odp/plat/version_types.h b/platform/linux-generic/include/odp/plat/version_types.h deleted file mode 100644 index e3327eb..0000000 --- a/platform/linux-generic/include/odp/plat/version_types.h +++ /dev/null @@ -1,30 +0,0 @@ -/* Copyright (c) 2015, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -#ifndef ODP_VERSION_TYPESH_ -#define ODP_VERSION_TYPESH_ - -#ifdef __cplusplus -extern "C" { -#endif - -/** @internal Version string expand */ -#define ODP_VERSION_STR_EXPAND(x) #x - -/** @internal Version to string */ -#define ODP_VERSION_TO_STR(x) ODP_VERSION_STR_EXPAND(x) - -/** @internal API version string */ -#define ODP_VERSION_API_STR \ -ODP_VERSION_TO_STR(ODP_VERSION_API_GENERATION) "." \ -ODP_VERSION_TO_STR(ODP_VERSION_API_MAJOR) "." \ -ODP_VERSION_TO_STR(ODP_VERSION_API_MINOR) - -#ifdef __cplusplus -} -#endif - -#endif diff --git a/platform/linux-generic/include/odp/version.h b/platform/linux-generic/include/odp/version.h index c98cb30..b5071e5 100644 --- a/platform/linux-generic/include/odp/version.h +++ b/platform/linux-generic/include/odp/version.h @@ -17,7 +17,18 @@ extern "C" { #endif -#include +/** @internal Version string expand */ +#define ODP_VERSION_STR_EXPAND(x) #x + +/** @internal Version to string */ +#define ODP_VERSION_TO_STR(x) ODP_VERSION_STR_EXPAND(x) + +/** @internal API version string */ +#define ODP_VERSION_API_STR \ +ODP_VERSION_TO_STR(ODP_VERSION_API_GENERATION) "." \ +ODP_VERSION_TO_STR(ODP_VERSION_API_MAJOR) "." \ +ODP_VERSION_TO_STR(ODP_VERSION_API_MINOR) + #include #ifdef __cplusplus diff --git a/platform/linux-generic/odp_version.c b/platform/linux-generic/odp_version.c index 0a57b5e..2a7cd6e 100644 --- a/platform/linux-generic/odp_version.c +++ b/platform/linux-generic/odp_version.c @@ -9,7 +9,7 @@ #endif #include -#include +#include const char *odp_version_api_str(void) {