From patchwork Thu Nov 26 12:35:46 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Uvarov X-Patchwork-Id: 57327 Delivered-To: patch@linaro.org Received: by 10.112.155.196 with SMTP id vy4csp489728lbb; Thu, 26 Nov 2015 04:36:01 -0800 (PST) X-Received: by 10.140.32.162 with SMTP id h31mr44696340qgh.93.1448541361609; Thu, 26 Nov 2015 04:36:01 -0800 (PST) Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id v70si15370758qka.110.2015.11.26.04.36.01; Thu, 26 Nov 2015 04:36:01 -0800 (PST) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) client-ip=54.225.227.206; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dkim=neutral (body hash did not verify) header.i=@linaro-org.20150623.gappssmtp.com Received: by lists.linaro.org (Postfix, from userid 109) id 0BAC2619D9; Thu, 26 Nov 2015 12:36:01 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-2.5 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, T_DKIM_INVALID, URIBL_BLOCKED autolearn=disabled version=3.4.0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id 2613761978; Thu, 26 Nov 2015 12:35:56 +0000 (UTC) X-Original-To: lng-odp@lists.linaro.org Delivered-To: lng-odp@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id C34B16198C; Thu, 26 Nov 2015 12:35:54 +0000 (UTC) Received: from mail-lf0-f50.google.com (mail-lf0-f50.google.com [209.85.215.50]) by lists.linaro.org (Postfix) with ESMTPS id C680261807 for ; Thu, 26 Nov 2015 12:35:53 +0000 (UTC) Received: by lfaz4 with SMTP id z4so96268199lfa.0 for ; Thu, 26 Nov 2015 04:35:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro-org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id; bh=zusdGPELl6ZgeFXr22OojHB6YDLaGXLZeEeD+VOi6Ug=; b=uZ2YgoGpa6QxI8FjTiItEn+7LqEADDKuZ4wVSgvJHNqIvIMs6HugqujTAD87dX2RWF ihFUM9tr0N5TpuMGjoR8oOpFVm1vkMPfr+iVGVZxupoPBtMhhkAUKxQRMQoWousoVV48 vfJSe0tdOMxrAvh6T0N9hN6IQLA39jjqNNCLBCfVVTQ7geCUggSi0KSpJQ1e2dtpCrWo EOBVz3rUA1gpQ01hPyTs8BB1hGeSBhZkSFRv66/eOTe0oKJeuCgvJ+5nHnDwCnBi2APO 4ykcfcPLQH8ITD8YlK1lPF9GW5jcwx2oejcJTWni7sMOKvgllvlgALaiBXqvU4uJFaUD deXg== 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; bh=zusdGPELl6ZgeFXr22OojHB6YDLaGXLZeEeD+VOi6Ug=; b=UzjX+9AYe9SyABVCqrjv608jnT5+SaXxtPgxDVVy90aGUwPIKhE1tJ50oQMHs9ZexV BpUjNFbWA+acImWNkAyZJ5sUA+X4sF/I/3Gw/dcXlh3gv0pnWYDvyEvJh1znNGyGo9cX mHHWyV2mCi0obwvjLIOV9K8VIKeabg+q7oLmnRHhMj7yyLzJ3hvZ3nuBaec5/KejvGUC bm7DOzPxJPpV0gKCVfYu+d6L6NxaoVd/V19X9hCzzl7WQz5fubaJ0AP9DLO2uZYQiGwR HIXicX/XHppxjo47qRvjIqadcjQcvQOiUPrI0U4GcZtG3I9PypMF9mguzqomQXWhGqwr Vycg== X-Gm-Message-State: ALoCoQm7zQuY0/HVG/Oo0wxpzs23DLhz1BUUczq9GFPfxtCNyLH3bBpdD9EwuauJKNl7vwE8jC9w X-Received: by 10.25.38.84 with SMTP id m81mr4578018lfm.50.1448541352705; Thu, 26 Nov 2015 04:35:52 -0800 (PST) Received: from localhost.localdomain (ppp91-76-173-134.pppoe.mtu-net.ru. [91.76.173.134]) by smtp.gmail.com with ESMTPSA id w7sm4088300lbb.14.2015.11.26.04.35.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 26 Nov 2015 04:35:52 -0800 (PST) From: Maxim Uvarov To: lng-odp@lists.linaro.org Date: Thu, 26 Nov 2015 15:35:46 +0300 Message-Id: <1448541346-10851-1-git-send-email-maxim.uvarov@linaro.org> X-Mailer: git-send-email 1.9.1 X-Topics: patch Subject: [lng-odp] [API-NEXT PATCHv2] mergefix: add mising includes to Makefile.inc X-BeenThere: lng-odp@lists.linaro.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: "The OpenDataPlane \(ODP\) List" 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" Looks like merge conflict was not cleanly fixed moving includes from Makefile.am to Makefile.inc. Adding missed. Signed-off-by: Maxim Uvarov Reviewed-by: Anders Roxell --- v2: - added missing std_clib.h (thanks Anders) - patch prefix is API-NEXT platform/Makefile.inc | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/platform/Makefile.inc b/platform/Makefile.inc index e6984cc..0863c75 100644 --- a/platform/Makefile.inc +++ b/platform/Makefile.inc @@ -32,22 +32,27 @@ odpapiinclude_HEADERS = \ $(top_srcdir)/include/odp/api/debug.h \ $(top_srcdir)/include/odp/api/errno.h \ $(top_srcdir)/include/odp/api/event.h \ + $(top_srcdir)/include/odp/api/hash.h \ $(top_srcdir)/include/odp/api/hints.h \ $(top_srcdir)/include/odp/api/init.h \ $(top_srcdir)/include/odp/api/packet.h \ $(top_srcdir)/include/odp/api/packet_flags.h \ $(top_srcdir)/include/odp/api/packet_io.h \ + $(top_srcdir)/include/odp/api/packet_io_stats.h \ $(top_srcdir)/include/odp/api/pool.h \ $(top_srcdir)/include/odp/api/queue.h \ $(top_srcdir)/include/odp/api/random.h \ $(top_srcdir)/include/odp/api/rwlock.h \ + $(top_srcdir)/include/odp/api/rwlock_recursive.h \ $(top_srcdir)/include/odp/api/schedule.h \ $(top_srcdir)/include/odp/api/schedule_types.h \ $(top_srcdir)/include/odp/api/shared_memory.h \ $(top_srcdir)/include/odp/api/spinlock.h \ + $(top_srcdir)/include/odp/api/std_clib.h \ $(top_srcdir)/include/odp/api/std_types.h \ $(top_srcdir)/include/odp/api/sync.h \ $(top_srcdir)/include/odp/api/system_info.h \ + $(top_srcdir)/include/odp/api/spinlock_recursive.h \ $(top_srcdir)/include/odp/api/thread.h \ $(top_srcdir)/include/odp/api/thrmask.h \ $(top_srcdir)/include/odp/api/ticketlock.h \