Index: include/libnetfilter_conntrack/libnetfilter_conntrack.h
===================================================================
--- include/libnetfilter_conntrack/libnetfilter_conntrack.h	(revision 6670)
+++ include/libnetfilter_conntrack/libnetfilter_conntrack.h	(working copy)
@@ -8,6 +8,18 @@
 #ifndef _LIBNETFILTER_CONNTRACK_H_
 #define _LIBNETFILTER_CONNTRACK_H_
 
+
+/* Disable inline keyword when compiling in strict ANSI conformance */
+#if defined(__STRICT_ANSI__) && !defined(__cplusplus)
+#  define inline
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+
 #include <netinet/in.h>
 #include <libnfnetlink/linux_nfnetlink.h>
 #include <libnfnetlink/libnfnetlink.h>
@@ -332,6 +344,8 @@
 extern void nfct_build_tuple(struct nfnlhdr *req, int size, 
 			     struct nfct_tuple *t, int type);
 
+#ifdef __cplusplus
+}
+#endif
 
-
 #endif	/* _LIBNETFILTER_CONNTRACK_H_ */