From patchwork Mon Feb 16 14:28:04 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Uvarov X-Patchwork-Id: 44701 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ee0-f72.google.com (mail-ee0-f72.google.com [74.125.83.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id F14CD21544 for ; Mon, 16 Feb 2015 14:30:52 +0000 (UTC) Received: by mail-ee0-f72.google.com with SMTP id e53sf20229348eek.3 for ; Mon, 16 Feb 2015 06:30:52 -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=Imbpdb8v7uSoi1d/PzXjZhY+Grz12PAntF2BwKYtDqGQtRwgwoDSJTjWySFuy3UMPH wzeZCZZbNm6lncos2+RzV+dW56fH/d4EaOsl8SQI+GksXWZRNOJVm7RzsiycZkHE0b00 pakqyBBbZYIBXpy5GeFsQ9MS4bhKInqjnulo4t+pOguabqKpfiAfid0XG0Jmp1Xlrpx6 GrMHHuIEKIC/n4leQ0QGZ+8VhG9LIuknZYJSkFRbUI3ApHJRyZIkjxQZFE0mpyyiPIEw D0OD07iSk9y7pqSiFBowsqV9KYFxSZEdaPgeuiglNo0ZjDwbtIISxcAqDvOKZppspTV9 obZw== X-Gm-Message-State: ALoCoQlNMONYOPFpJ0hba+D9KAQzQ7QYONkmyglvmDOMC+l7lzGW3yCvZvPqG4HiEbY3mhOPyN// X-Received: by 10.152.2.67 with SMTP id 3mr2980449las.8.1424097052184; Mon, 16 Feb 2015 06:30:52 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.198.6 with SMTP id iy6ls71196lac.38.gmail; Mon, 16 Feb 2015 06:30:52 -0800 (PST) X-Received: by 10.152.163.161 with SMTP id yj1mr21823354lab.99.1424097052041; Mon, 16 Feb 2015 06:30:52 -0800 (PST) Received: from mail-la0-f48.google.com (mail-la0-f48.google.com. [209.85.215.48]) by mx.google.com with ESMTPS id cf4si7508933lbb.33.2015.02.16.06.30.51 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 16 Feb 2015 06:30:51 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.48 as permitted sender) client-ip=209.85.215.48; Received: by labhz20 with SMTP id hz20so28908872lab.0 for ; Mon, 16 Feb 2015 06:30:51 -0800 (PST) X-Received: by 10.112.161.34 with SMTP id xp2mr22508845lbb.73.1424097051894; Mon, 16 Feb 2015 06:30:51 -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 h5csp1617254lbj; Mon, 16 Feb 2015 06:30:51 -0800 (PST) X-Received: by 10.140.165.209 with SMTP id l200mr38712qhl.84.1424097051054; Mon, 16 Feb 2015 06:30:51 -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 u13si14245659qag.86.2015.02.16.06.30.49 (version=TLSv1 cipher=RC4-SHA bits=128/128); Mon, 16 Feb 2015 06:30:51 -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 1YNMh9-0006od-Da; Mon, 16 Feb 2015 14:30:43 +0000 Received: from mail-la0-f46.google.com ([209.85.215.46]) by ip-10-35-177-41.ec2.internal with esmtp (Exim 4.76) (envelope-from ) id 1YNMh3-0006m1-Ou for lng-odp@lists.linaro.org; Mon, 16 Feb 2015 14:30:37 +0000 Received: by labgm9 with SMTP id gm9so29131224lab.2 for ; Mon, 16 Feb 2015 06:30:32 -0800 (PST) X-Received: by 10.112.188.165 with SMTP id gb5mr6552670lbc.35.1424097032180; Mon, 16 Feb 2015 06:30:32 -0800 (PST) Received: from localhost.localdomain (broadband-46-188-125-106.2com.net. [46.188.125.106]) by mx.google.com with ESMTPSA id cb5sm2972712lad.3.2015.02.16.06.30.24 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 16 Feb 2015 06:30:31 -0800 (PST) From: Maxim Uvarov To: lng-odp@lists.linaro.org Date: Mon, 16 Feb 2015 17:28:04 +0300 Message-Id: <1424096886-2645-4-git-send-email-maxim.uvarov@linaro.org> X-Mailer: git-send-email 1.8.5.1.163.gd7aced9 In-Reply-To: <1424096886-2645-1-git-send-email-maxim.uvarov@linaro.org> References: <1424096886-2645-1-git-send-email-maxim.uvarov@linaro.org> X-Topics: patch Subject: [lng-odp] [PATCHv2 3/5] 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.48 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) {