From patchwork Wed Jul 3 11:25:38 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeremy Sowden X-Patchwork-Id: 1126846 X-Patchwork-Delegate: pablo@netfilter.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netfilter-devel-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=azazel.net Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; secure) header.d=azazel.net header.i=@azazel.net header.b="ub+pNn57"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 45dzLY1THRz9s00 for ; Wed, 3 Jul 2019 21:25:41 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726811AbfGCLZk (ORCPT ); Wed, 3 Jul 2019 07:25:40 -0400 Received: from kadath.azazel.net ([81.187.231.250]:40796 "EHLO kadath.azazel.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726581AbfGCLZk (ORCPT ); Wed, 3 Jul 2019 07:25:40 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=azazel.net; s=20190108; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=ZKrkpjROQuQl5lJIb+OK7ftHH/K4WFuJcbTlGQaBews=; b=ub+pNn575AtIBMJW4HFt2UiCpt g75bfjK/+LnfWtj40qQsSsyS15msFddcSMAJlPm5eUIHspQaumiYyz4PM7PPOC9k/yEfavY5EE7eZ ZnARPDjCEWzB+2CjMTtneJ8flbObWAfyHicSqDE+xVLpLfe6WwhG3zRLYZFLe5klMe1/ML/mGIkLJ BgEscvMEj8gVgwSU+4YpBtxEVvDptFMrjooJfivBl4dICMzQY3EpCP/igHaJ8rQ3KqsuRJLNMkmOa sZwCOstVwwJAlYbglarTwRFE45cIhWRZxwS7eZqEOHIENF8IGM9PexSzXGchEjKdIChoh3rmuew2u 5KXgRkng==; Received: from ulthar.dreamlands ([192.168.96.2]) by kadath.azazel.net with esmtp (Exim 4.89) (envelope-from ) id 1hidOM-0005WL-K9; Wed, 03 Jul 2019 12:25:38 +0100 From: Jeremy Sowden To: Netfilter Devel Cc: Stefan Laufmann Subject: [PATCH] Added extern "C" declarations to header-files. Date: Wed, 3 Jul 2019 12:25:38 +0100 Message-Id: <20190703112538.2506-1-jeremy@azazel.net> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190703111806.qtygttpa34dmfghp@breakpoint.cc> References: <20190703111806.qtygttpa34dmfghp@breakpoint.cc> MIME-Version: 1.0 X-SA-Exim-Connect-IP: 192.168.96.2 X-SA-Exim-Mail-From: jeremy@azazel.net X-SA-Exim-Scanned: No (on kadath.azazel.net); SAEximRunCond expanded to false Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org Declare functions with extern "C" for inclusion in C++. Reported-by: Stefan Laufmann Signed-off-by: Jeremy Sowden --- include/libnetfilter_log/libipulog.h | 8 ++++++++ include/libnetfilter_log/libnetfilter_log.h | 8 ++++++++ 2 files changed, 16 insertions(+) diff --git a/include/libnetfilter_log/libipulog.h b/include/libnetfilter_log/libipulog.h index ee7890a2d93c..deb0dcc72577 100644 --- a/include/libnetfilter_log/libipulog.h +++ b/include/libnetfilter_log/libipulog.h @@ -16,6 +16,10 @@ #define ULOG_PREFIX_LEN 32 #define ULOG_IFNAMSIZ 16 +#ifdef __cplusplus +extern "C" { +#endif + /* Format of the ULOG packets passed through netlink */ typedef struct ulog_packet_msg { unsigned long mark; @@ -67,5 +71,9 @@ enum }; #define IPULOG_MAXERR IPULOG_ERR_INVNL +#ifdef __cplusplus +} /* extern "C" */ +#endif + #endif /* _LIBIPULOG_H */ diff --git a/include/libnetfilter_log/libnetfilter_log.h b/include/libnetfilter_log/libnetfilter_log.h index 46767eb003c9..6192fa3a5cf1 100644 --- a/include/libnetfilter_log/libnetfilter_log.h +++ b/include/libnetfilter_log/libnetfilter_log.h @@ -14,6 +14,10 @@ #include #include +#ifdef __cplusplus +extern "C" { +#endif + struct nflog_handle; struct nflog_g_handle; struct nflog_data; @@ -97,4 +101,8 @@ int nflog_nlmsg_snprintf(char *buf, size_t bufsiz, const struct nlmsghdr *nlh, struct nlattr **attr, enum nflog_output_type type, uint32_t flags); +#ifdef __cplusplus +} /* extern "C" */ +#endif + #endif /* __LIBNETFILTER_LOG_H */