[netfilter-cvslog] r3748 - branches/patch-o-matic-ng/linux-2.6.11/osf/linux-2.6/include/linux/netfilter_ipv4 trunk/patch-o-matic-ng/osf/linux-2.6/include/linux/netfilter_ipv4

[kaber at netfilter.org]

Author: kaber at netfilter.org
Date: 2005-03-01 21:30:06 +0100 (Tue, 01 Mar 2005)
New Revision: 3748

Modified:
   branches/patch-o-matic-ng/linux-2.6.11/osf/linux-2.6/include/linux/netfilter_ipv4/ipt_osf.h
   trunk/patch-o-matic-ng/osf/linux-2.6/include/linux/netfilter_ipv4/ipt_osf.h
Log:
[1/2] ipt_osf: move kernel headers into appropriate ifdef/endif area (Evgeniy Polyakov <johnpol at 2ka.mipt.ru>)


Modified: branches/patch-o-matic-ng/linux-2.6.11/osf/linux-2.6/include/linux/netfilter_ipv4/ipt_osf.h
===================================================================
--- branches/patch-o-matic-ng/linux-2.6.11/osf/linux-2.6/include/linux/netfilter_ipv4/ipt_osf.h	2005-03-01 09:56:09 UTC (rev 3747)
+++ branches/patch-o-matic-ng/linux-2.6.11/osf/linux-2.6/include/linux/netfilter_ipv4/ipt_osf.h	2005-03-01 20:30:06 UTC (rev 3748)
@@ -33,9 +33,6 @@
 #define IPT_OSF_LOGLEVEL_ALL   0
 #define IPT_OSF_LOGLEVEL_FIRST 1
 
-#include <linux/list.h>
-#include <net/tcp.h>
-
 #ifndef __KERNEL__
 #include <netinet/ip.h>
 #include <netinet/tcp.h>
@@ -98,6 +95,10 @@
 
 #ifdef __KERNEL__
 
+#include <linux/list.h>
+#include <net/tcp.h>
+
+
 /* Defines for IANA option kinds */
 
 #define OSFOPT_EOL             0       /* End of options */

Modified: trunk/patch-o-matic-ng/osf/linux-2.6/include/linux/netfilter_ipv4/ipt_osf.h
===================================================================
--- trunk/patch-o-matic-ng/osf/linux-2.6/include/linux/netfilter_ipv4/ipt_osf.h	2005-03-01 09:56:09 UTC (rev 3747)
+++ trunk/patch-o-matic-ng/osf/linux-2.6/include/linux/netfilter_ipv4/ipt_osf.h	2005-03-01 20:30:06 UTC (rev 3748)
@@ -33,9 +33,6 @@
 #define IPT_OSF_LOGLEVEL_ALL   0
 #define IPT_OSF_LOGLEVEL_FIRST 1
 
-#include <linux/list.h>
-#include <net/tcp.h>
-
 #ifndef __KERNEL__
 #include <netinet/ip.h>
 #include <netinet/tcp.h>
@@ -98,6 +95,10 @@
 
 #ifdef __KERNEL__
 
+#include <linux/list.h>
+#include <net/tcp.h>
+
+
 /* Defines for IANA option kinds */
 
 #define OSFOPT_EOL             0       /* End of options */