[hipl-commit] [trunk] Rev 4360: Remove unnecessary #ifdefs around harmless header #includes.

From: Diego Biurrun <diego@xxxxxxxxxx>
To: hipl-commit@xxxxxxxxxxxxx
Date: Tue, 20 Apr 2010 15:16:13 +0300
Committer: Diego Biurrun <diego@xxxxxxxxxx>
Date: 20/04/2010 at 15:16:13
Revision: 4360
Revision-id: diego@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
Branch nick: trunk

Log:
  Remove unnecessary #ifdefs around harmless header #includes.

Modified:
  M  firewall/conntrack.c
  M  firewall/firewall.c
  M  hipd/hadb.h
  M  hipd/hipd.h
  M  hipd/init.c
  M  hipd/input.c
  M  hipd/input.h
  M  hipd/update.c

=== modified file 'firewall/conntrack.c'
--- firewall/conntrack.c        2010-04-15 23:25:38 +0000
+++ firewall/conntrack.c        2010-04-20 12:15:57 +0000
@@ -36,10 +36,7 @@
 #include "lib/core/debug.h"
 #include "lib/core/performance.h"
 #include "helpers.h"
-
-#ifdef CONFIG_HIP_MIDAUTH
 #include "pisa.h"
-#endif
 
 DList *hipList = NULL;
 DList *espList = NULL;

=== modified file 'firewall/firewall.c'
--- firewall/firewall.c 2010-04-15 23:36:41 +0000
+++ firewall/firewall.c 2010-04-20 12:15:57 +0000
@@ -47,9 +47,7 @@
 #include "sysopp.h" /* System-based Opportunistic HIP */
 #include "datapkt.h"
 #include "firewalldb.h"
-#ifdef CONFIG_HIP_MIDAUTH
 #include "pisa.h" /* PISA */
-#endif
 #include "helpers.h"
 #include "lib/core/filemanip.h"
 #include "lib/core/performance.h"

=== modified file 'hipd/hadb.h'
--- hipd/hadb.h 2010-04-14 13:13:52 +0000
+++ hipd/hadb.h 2010-04-20 12:15:57 +0000
@@ -22,10 +22,7 @@
 #include "lib/tool/xfrmapi.h"
 #include "nat.h"
 #include "hadb_legacy.h"
-
-#ifdef CONFIG_HIP_BLIND
 #include "blind.h"
-#endif
 
 #define HIP_LOCK_INIT(ha)
 #define HIP_LOCK_HA(ha)

=== modified file 'hipd/hipd.h'
--- hipd/hipd.h 2010-04-20 10:44:16 +0000
+++ hipd/hipd.h 2010-04-20 12:15:57 +0000
@@ -36,12 +36,10 @@
         #include "lib/core/sqlitedbapi.h"
 #endif
 #include "dhtqueue.h"
+#include "blind.h"
 
 #include "i3/i3_client/i3_client_api.h"
 
-#ifdef CONFIG_HIP_BLIND
-#include "blind.h"
-#endif
 
 #define HIP_HIT_DEV "dummy0"
 

=== modified file 'hipd/init.c'
--- hipd/init.c 2010-04-16 18:42:21 +0000
+++ hipd/init.c 2010-04-20 12:15:57 +0000
@@ -16,6 +16,7 @@
 #include <netinet/icmp6.h>
 
 #include "config.h"
+#include "hipd.h"
 #include "init.h"
 #include "oppdb.h"
 #include "lib/core/common_defines.h"
@@ -29,10 +30,6 @@
 #include "lib/core/hip_udp.h"
 #include "lib/core/hostsfiles.h"
 
-#ifdef CONFIG_HIP_AGENT
-#include "hipd.h"
-#endif
-
 
 /**
  * HIP daemon lock file is used to prevent multiple instances

=== modified file 'hipd/input.c'
--- hipd/input.c        2010-04-16 18:49:34 +0000
+++ hipd/input.c        2010-04-20 12:15:57 +0000
@@ -28,6 +28,7 @@
 #include "lib/core/crypto.h"
 #include "lib/core/builder.h"
 #include "lib/core/hip_udp.h"
+#include "lib/core/hostid.h"
 #include "lib/core/solve.h"
 #include "lib/core/transform.h"
 #include "lib/core/keylen.h"
@@ -50,14 +51,7 @@
 
 #include "i3/i3_client/i3_client_api.h"
 #include "oppipdb.h"
-
-#ifdef CONFIG_HIP_MIDAUTH
 #include "pisa.h"
-#endif
-
-#ifdef CONFIG_HIP_BLIND
-#include "lib/core/hostid.h"
-#endif
 
 /**
  * Verifies a HMAC.

=== modified file 'hipd/input.h'
--- hipd/input.h        2010-03-09 21:23:38 +0000
+++ hipd/input.h        2010-04-20 12:15:57 +0000
@@ -16,10 +16,7 @@
 #define HIP_HIPD_INPUT_H
 
 #include "config.h"
-#ifdef CONFIG_HIP_RVS
-  #include "hiprelay.h"
-#endif
-
+#include "hiprelay.h"
 #include "lib/core/state.h"
 #include "lib/core/debug.h"
 #include "lib/core/protodefs.h"

=== modified file 'hipd/update.c'
--- hipd/update.c       2010-04-16 18:48:01 +0000
+++ hipd/update.c       2010-04-20 12:15:57 +0000
@@ -20,10 +20,7 @@
 #include "lib/core/builder.h"
 #include "update_legacy.h"
 #include "esp_prot_hipd_msg.h"
-
-#ifdef CONFIG_HIP_MIDAUTH
 #include "pisa.h"
-#endif
 
 int update_id_window_size = 50;
[hipl-commit] [trunk] Rev 4360: Remove unnecessary #ifdefs around harmless header #includes.

Other related posts:
