[hipl-commit] [trunk] Rev 4176: Remove #ifdef around performance measurement header.
- From: Diego Biurrun <diego@xxxxxxxxxx>
- To: hipl-commit@xxxxxxxxxxxxx
- Date: Thu, 8 Apr 2010 14:23:00 +0300
Committer: Diego Biurrun <diego@xxxxxxxxxx>
Date: 08/04/2010 at 14:23:00
Revision: 4176
Revision-id: diego@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
Branch nick: trunk
Log:
Remove #ifdef around performance measurement header.
The header is absolutely harmless and can be #included unconditionally
without ill effect. Thus the #ifdefs are not worth the clutter they produce.
Modified:
M firewall/conntrack.c
M firewall/firewall.c
M firewall/pisa.c
M hipd/close.c
M hipd/hipd.c
M hipd/input.c
M hipd/output.c
M lib/core/crypto.c
M lib/tool/pk.c
=== modified file 'firewall/conntrack.c'
--- firewall/conntrack.c 2010-03-26 10:48:15 +0000
+++ firewall/conntrack.c 2010-04-08 11:21:53 +0000
@@ -34,16 +34,13 @@
#include "firewalldb.h"
#include "firewall.h"
#include "lib/core/debug.h"
+#include "lib/performance/performance.h"
#include "helpers.h"
#ifdef CONFIG_HIP_MIDAUTH
#include "pisa.h"
#endif
-#ifdef CONFIG_HIP_PERFORMANCE
-#include "lib/performance/performance.h"
-#endif
-
DList *hipList = NULL;
DList *espList = NULL;
=== modified file 'firewall/firewall.c'
--- firewall/firewall.c 2010-04-01 09:30:40 +0000
+++ firewall/firewall.c 2010-04-08 11:21:53 +0000
@@ -50,9 +50,7 @@
#ifdef CONFIG_HIP_MIDAUTH
#include "pisa.h" /* PISA */
#endif
-#ifdef CONFIG_HIP_PERFORMANCE
#include "lib/performance/performance.h" /* Performance Analysis */
-#endif
#include "helpers.h"
#include "lib/core/filemanip.h"
=== modified file 'firewall/pisa.c'
--- firewall/pisa.c 2010-03-29 17:50:59 +0000
+++ firewall/pisa.c 2010-04-08 11:21:53 +0000
@@ -23,6 +23,7 @@
#include "config.h"
#include "lib/core/ife.h"
#include "lib/core/crypto.h"
+#include "lib/performance/performance.h"
#include "midauth.h"
#include "pisa.h"
@@ -36,10 +37,6 @@
* call */
#define PISA_RANDOM_TTL 2.0
-#ifdef CONFIG_HIP_PERFORMANCE
-#include "lib/performance/performance.h"
-#endif
-
struct tuple *get_tuple_by_hits(const struct in6_addr *src_hit,
const struct in6_addr *dst_hit);
=== modified file 'hipd/close.c'
--- hipd/close.c 2010-03-18 12:09:47 +0000
+++ hipd/close.c 2010-04-08 11:21:53 +0000
@@ -13,9 +13,7 @@
#include "config.h"
#include "close.h"
-#ifdef CONFIG_HIP_PERFORMANCE
#include "lib/performance/performance.h"
-#endif
#include "lib/core/hip_udp.h"
/**
=== modified file 'hipd/hipd.c'
--- hipd/hipd.c 2010-03-18 17:12:09 +0000
+++ hipd/hipd.c 2010-04-08 11:21:53 +0000
@@ -16,10 +16,7 @@
#include "lib/core/filemanip.h"
#include "lib/core/straddr.h"
#include "heartbeat.h"
-
-#ifdef CONFIG_HIP_PERFORMANCE
#include "lib/performance/performance.h"
-#endif
/* Defined as a global just to allow freeing in exit(). Do not use outside
=== modified file 'hipd/input.c'
--- hipd/input.c 2010-03-18 12:09:47 +0000
+++ hipd/input.c 2010-04-08 11:21:53 +0000
@@ -29,6 +29,7 @@
#include "lib/core/solve.h"
#include "lib/core/transform.h"
#include "lib/core/keylen.h"
+#include "lib/performance/performance.h"
#include "dh.h"
#include "hidb.h"
@@ -52,10 +53,6 @@
#include "pisa.h"
#endif
-#ifdef CONFIG_HIP_PERFORMANCE
-#include "lib/performance/performance.h"
-#endif
-
#ifdef CONFIG_HIP_BLIND
#include "lib/core/hostid.h"
#endif
=== modified file 'hipd/output.c'
--- hipd/output.c 2010-03-18 12:28:12 +0000
+++ hipd/output.c 2010-04-08 11:21:53 +0000
@@ -20,9 +20,7 @@
#include "config.h"
#include "output.h"
-#ifdef CONFIG_HIP_PERFORMANCE
#include "lib/performance/performance.h"
-#endif
#ifdef CONFIG_HIP_I3
#include "i3/i3_client/i3_client_id.h"
=== modified file 'lib/core/crypto.c'
--- lib/core/crypto.c 2010-03-30 12:41:08 +0000
+++ lib/core/crypto.c 2010-04-08 11:21:53 +0000
@@ -34,10 +34,7 @@
#include "config.h"
#include "crypto.h"
#include "keylen.h"
-
-#ifdef CONFIG_HIP_PERFORMANCE
#include "lib/performance/performance.h"
-#endif
/*
=== modified file 'lib/tool/pk.c'
--- lib/tool/pk.c 2010-03-18 21:15:21 +0000
+++ lib/tool/pk.c 2010-04-08 11:21:53 +0000
@@ -15,10 +15,7 @@
#include "config.h"
#include "pk.h"
-
-#ifdef CONFIG_HIP_PERFORMANCE
#include "lib/performance/performance.h"
-#endif
/**
* sign a HIP control message with a private RSA key
Other related posts:
- » [hipl-commit] [trunk] Rev 4176: Remove #ifdef around performance measurement header. - Diego Biurrun
