From: Jan Engelhardt <jengelh@medozas.de>
To: pablo@netfilter.org
Cc: netfilter-devel@vger.kernel.org
Subject: [PATCH 1/3] libipulog: rebuild required header file inclusion
Date: Sat, 18 Dec 2010 21:17:30 +0100 [thread overview]
Message-ID: <1292703453-16324-2-git-send-email-jengelh@medozas.de> (raw)
In-Reply-To: <1292703453-16324-1-git-send-email-jengelh@medozas.de>
Use C++ headers for C++ and throw out #includes that are not needed
for the header file.
Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
---
include/libnetfilter_log/libipulog.h | 9 ++++++---
src/libipulog_compat.c | 1 +
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/include/libnetfilter_log/libipulog.h b/include/libnetfilter_log/libipulog.h
index 0278862..bb6736a 100644
--- a/include/libnetfilter_log/libipulog.h
+++ b/include/libnetfilter_log/libipulog.h
@@ -1,9 +1,12 @@
#ifndef _LIBIPULOG_H
#define _LIBIPULOG_H
-#include <errno.h>
-#include <unistd.h>
-#include <fcntl.h>
+#ifdef __cplusplus
+# include <cstdint>
+#else
+# include <stdint.h>
+#endif
+#include <sys/types.h>
/* FIXME: glibc sucks */
#ifndef MSG_TRUNC
diff --git a/src/libipulog_compat.c b/src/libipulog_compat.c
index 9d93bcd..8c90cdb 100644
--- a/src/libipulog_compat.c
+++ b/src/libipulog_compat.c
@@ -1,3 +1,4 @@
+#include <errno.h>
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
--
1.7.1
next prev parent reply other threads:[~2010-12-18 20:17 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-12-18 20:17 libnetfilter_log: misc annotations Jan Engelhardt
2010-12-18 20:17 ` Jan Engelhardt [this message]
2010-12-21 19:46 ` [PATCH 1/3] libipulog: rebuild required header file inclusion Pablo Neira Ayuso
2010-12-18 20:17 ` [PATCH 2/3] src: remove redundant casts Jan Engelhardt
2010-12-21 19:56 ` Pablo Neira Ayuso
2010-12-18 20:17 ` [PATCH 3/3] src: declare non-modified data as const Jan Engelhardt
2010-12-21 19:56 ` Pablo Neira Ayuso
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=1292703453-16324-2-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).