Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E7B6FC4320E for ; Tue, 10 Aug 2021 16:08:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id CB13B610A8 for ; Tue, 10 Aug 2021 16:08:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233349AbhHJQIp (ORCPT ); Tue, 10 Aug 2021 12:08:45 -0400 Received: from mail.netfilter.org ([217.70.188.207]:42506 "EHLO mail.netfilter.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233058AbhHJQIo (ORCPT ); Tue, 10 Aug 2021 12:08:44 -0400 Received: from salvia.lan (bl11-146-165.dsl.telepac.pt [85.244.146.165]) by mail.netfilter.org (Postfix) with ESMTPSA id 076CE60030; Tue, 10 Aug 2021 18:07:38 +0200 (CEST) From: Pablo Neira Ayuso To: netfilter-devel@vger.kernel.org Cc: duncan_roe@optusnet.com.au Subject: [PATCH libnetfilter_queue] include: deprecate libnetfilter_queue/linux_nfnetlink_queue.h Date: Tue, 10 Aug 2021 18:08:13 +0200 Message-Id: <20210810160813.26984-1-pablo@netfilter.org> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org Emit a warning to notify users that this file is deprecated. Signed-off-by: Pablo Neira Ayuso --- include/libnetfilter_queue/libnetfilter_queue.h | 2 -- include/libnetfilter_queue/linux_nfnetlink_queue.h | 2 ++ src/libnetfilter_queue.c | 1 + utils/nfqnl_test.c | 1 + 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/include/libnetfilter_queue/libnetfilter_queue.h b/include/libnetfilter_queue/libnetfilter_queue.h index a19122f10ec6..42a3a45f27e1 100644 --- a/include/libnetfilter_queue/libnetfilter_queue.h +++ b/include/libnetfilter_queue/libnetfilter_queue.h @@ -16,8 +16,6 @@ #include #include -#include - #ifdef __cplusplus extern "C" { #endif diff --git a/include/libnetfilter_queue/linux_nfnetlink_queue.h b/include/libnetfilter_queue/linux_nfnetlink_queue.h index caa67884482c..84f5d96c0a7b 100644 --- a/include/libnetfilter_queue/linux_nfnetlink_queue.h +++ b/include/libnetfilter_queue/linux_nfnetlink_queue.h @@ -1,6 +1,8 @@ #ifndef _NFNETLINK_QUEUE_H #define _NFNETLINK_QUEUE_H +#warning "#include is deprecated, use #include instead." + #ifndef aligned_u64 #define aligned_u64 unsigned long long __attribute__((aligned(8))) #endif diff --git a/src/libnetfilter_queue.c b/src/libnetfilter_queue.c index ef3b21101998..11a4e7c51cc0 100644 --- a/src/libnetfilter_queue.c +++ b/src/libnetfilter_queue.c @@ -29,6 +29,7 @@ #include #include #include +#include #include #include diff --git a/utils/nfqnl_test.c b/utils/nfqnl_test.c index 5e76ffe48cc7..682f3d79d45a 100644 --- a/utils/nfqnl_test.c +++ b/utils/nfqnl_test.c @@ -5,6 +5,7 @@ #include #include #include /* for NF_ACCEPT */ +#include #include #include -- 2.20.1