From: Jan Engelhardt <jengelh@medozas.de>
To: pablo@netfilter.org
Cc: netfilter-devel@vger.kernel.org
Subject: [PATCH 2/5] include: use C++ headers in C++ mode
Date: Thu, 11 Nov 2010 00:08:01 +0100 [thread overview]
Message-ID: <1289430485-16467-3-git-send-email-jengelh@medozas.de> (raw)
In-Reply-To: <1289430485-16467-1-git-send-email-jengelh@medozas.de>
Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
---
include/libmnl/libmnl.h | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/include/libmnl/libmnl.h b/include/libmnl/libmnl.h
index 7094af2..37c502a 100644
--- a/include/libmnl/libmnl.h
+++ b/include/libmnl/libmnl.h
@@ -1,13 +1,16 @@
#ifndef _LIBMNL_H_
#define _LIBMNL_H_
-#include <stdio.h>
-#include <stdint.h>
+#ifdef __cplusplus
+# include <cstdio>
+# include <cstdint>
+#else
+# include <stdbool.h> /* not in C++ */
+# include <stdio.h>
+# include <stdint.h>
+#endif
#include <sys/socket.h> /* for sa_family_t */
#include <linux/netlink.h>
-#ifndef __cplusplus
-# include <stdbool.h>
-#endif
#ifdef __cplusplus
extern "C" {
--
1.7.1
next prev parent reply other threads:[~2010-11-10 23:08 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-11-10 23:07 libmnl misc patches Nov 11 Jan Engelhardt
2010-11-10 23:08 ` [PATCH 1/5] socket: constify a struct sockaddr_nl Jan Engelhardt
2010-11-11 12:56 ` Pablo Neira Ayuso
2010-11-10 23:08 ` Jan Engelhardt [this message]
2010-11-11 12:57 ` [PATCH 2/5] include: use C++ headers in C++ mode Pablo Neira Ayuso
2010-11-11 12:59 ` Jan Engelhardt
2010-11-11 13:15 ` Pablo Neira Ayuso
2010-11-13 18:19 ` Jan Engelhardt
2010-11-16 10:04 ` Pablo Neira Ayuso
2013-06-07 8:35 ` Thomas Jarosch
2013-06-08 13:38 ` Jan Engelhardt
2010-11-10 23:08 ` [PATCH 3/5] nlmsg: use bool for all _ok functions Jan Engelhardt
2010-11-11 12:59 ` Pablo Neira Ayuso
2010-11-10 23:08 ` [PATCH 4/5] attr: remove redundant check for NULL Jan Engelhardt
2010-11-11 13:02 ` Pablo Neira Ayuso
2010-11-10 23:08 ` [PATCH 5/5] attr: avoid multiple definition of hidden variable Jan Engelhardt
2010-11-11 13:08 ` Pablo Neira Ayuso
2010-11-11 13:25 ` Jan Engelhardt
2010-11-11 17:47 ` Pablo Neira Ayuso
2010-11-11 20:53 ` Jan Engelhardt
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1289430485-16467-3-git-send-email-jengelh@medozas.de \
--to=jengelh@medozas.de \
--cc=netfilter-devel@vger.kernel.org \
--cc=pablo@netfilter.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).