[hipl-commit] [trunk] Rev 3886: Remove pointless #ifdef guards around config.h #include.
- From: Diego Biurrun <diego@xxxxxxxxxx>
- To: hipl-commit@xxxxxxxxxxxxx
- Date: Tue, 9 Mar 2010 20:27:55 +0200
Committer: Diego Biurrun <diego@xxxxxxxxxx>
Date: Tue Mar 09 19:26:22 2010 +0100
Revision: 3886
Revision-id: diego@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
Branch nick: trunk
Log:
Remove pointless #ifdef guards around config.h #include.
There is no situation where config.h is not available.
Modified:
M agent/agent.c
M firewall/conntrack.c
M firewall/datapkt.c
M firewall/esp_prot_api.c
M firewall/esp_prot_config.h
M firewall/esp_prot_conntrack.c
M firewall/firewall.c
M firewall/firewall.h
M firewall/firewall_control.c
M firewall/firewall_control.h
M firewall/firewall_defines.h
M firewall/midauth.c
M firewall/pisa.c
M firewall/rule_management.c
M hipd/accessor.c
M hipd/cert.h
M hipd/close.c
M hipd/cookie.c
M hipd/hadb.c
M hipd/hadb.h
M hipd/hi3.h
M hipd/hidb.c
M hipd/hipd.c
M hipd/hipd.h
M hipd/hiprelay.c
M hipd/hiprelay.h
M hipd/icookie.c
M hipd/init.c
M hipd/input.c
M hipd/input.h
M hipd/maintenance.c
M hipd/netdev.c
M hipd/netdev.h
M hipd/nsupdate.c
M hipd/oppdb.c
M hipd/oppipdb.c
M hipd/output.c
M hipd/output.h
M hipd/pfkeyapi.c
M hipd/pfkeyapi.h
M hipd/update.c
M hipd/user.c
M i3/i3_client/i3_client_trigger.c
M lib/android/regex.c
M lib/conf/hipconf.c
M lib/conf/hipconf.h
M lib/core/builder.c
M lib/core/builder.h
M lib/core/certtools.h
M lib/core/crypto.c
M lib/core/crypto.h
M lib/core/debug.c
M lib/core/debug.h
M lib/core/filemanip.c
M lib/core/filemanip.h
M lib/core/hip_capability.c
M lib/core/hostid.c
M lib/core/hostid.h
M lib/core/hostsfiles.c
M lib/core/hostsfiles.h
M lib/core/message.h
M lib/core/misc.c
M lib/core/misc.h
M lib/core/prefix.h
M lib/core/solve.h
M lib/core/sqlitedbapi.c
M lib/core/sqlitedbapi.h
M lib/core/state.h
M lib/core/transform.h
M lib/dht/libhipdht.h
M lib/ipsec/ipsec_strerror.c
M lib/ipsec/pfkey.c
M lib/ipsec/policy_parse.c
M lib/ipsec/policy_parse.y
M lib/ipsec/policy_token.l
M lib/opphip/wrap.c
M lib/opphip/wrap_db.c
M lib/tool/lutil.h
M lib/tool/nlink.c
M lib/tool/pk.c
M lib/tool/xfrmapi.c
M test/auth_performance.c
M test/conntest-client-hip.c
M test/conntest-client-native.c
M test/conntest-client-opp.c
M test/conntest-server.c
M test/dh_performance.c
M test/sqliteteststub.c
=== modified file 'agent/agent.c'
--- agent/agent.c 2010-03-03 13:16:18 +0000
+++ agent/agent.c 2010-03-09 18:26:22 +0000
@@ -16,10 +16,6 @@
#define _BSD_SOURCE
-#ifdef HAVE_CONFIG_H
- #include "config.h"
-#endif /* HAVE_CONFIG_H */
-
#include <fcntl.h>
#include <sys/un.h>
#include <sys/types.h>
@@ -32,6 +28,7 @@
#include <unistd.h>
#include <time.h>
+#include "config.h"
#include "agent.h"
#include "tools.h"
#include "gui_interface.h"
=== modified file 'firewall/conntrack.c'
--- firewall/conntrack.c 2010-03-08 22:21:34 +0000
+++ firewall/conntrack.c 2010-03-09 18:26:22 +0000
@@ -20,10 +20,7 @@
#include <stdio.h>
-#ifdef HAVE_CONFIG_H
- #include "config.h"
-#endif /* HAVE_CONFIG_H */
-
+#include "config.h"
#include "conntrack.h"
#include "dlist.h"
#include "hslist.h"
=== modified file 'firewall/datapkt.c'
--- firewall/datapkt.c 2010-03-08 22:07:59 +0000
+++ firewall/datapkt.c 2010-03-09 18:26:22 +0000
@@ -27,10 +27,7 @@
/* required for s6_addr32 */
#define _BSD_SOURCE
-#ifdef HAVE_CONFIG_H
- #include "config.h"
-#endif /* HAVE_CONFIG_H */
-
+#include "config.h"
#include "datapkt.h"
#include "user_ipsec_api.h"
#include "user_ipsec_esp.h"
=== modified file 'firewall/esp_prot_api.c'
--- firewall/esp_prot_api.c 2010-02-18 13:36:05 +0000
+++ firewall/esp_prot_api.c 2010-03-09 18:26:22 +0000
@@ -18,9 +18,7 @@
#include <openssl/sha.h>
#include <math.h>
-#ifdef HAVE_CONFIG_H
- #include "config.h"
-#endif /* HAVE_CONFIG_H */
+#include "config.h"
#include "lib/core/common_defines.h"
#include "lib/core/debug.h"
=== modified file 'firewall/esp_prot_config.h'
--- firewall/esp_prot_config.h 2010-02-17 17:38:08 +0000
+++ firewall/esp_prot_config.h 2010-03-09 18:26:22 +0000
@@ -16,9 +16,7 @@
#ifndef HIP_FIREWALL_ESP_PROT_CONFIG_H
#define HIP_FIREWALL_ESP_PROT_CONFIG_H
-#ifdef HAVE_CONFIG_H
- #include "config.h"
-#endif /* HAVE_CONFIG_H */
+#include "config.h"
/* WORKAROUND: some platforms don't support libconfig out of the box */
#ifdef HAVE_LIBCONFIG
=== modified file 'firewall/esp_prot_conntrack.c'
--- firewall/esp_prot_conntrack.c 2010-02-17 17:38:08 +0000
+++ firewall/esp_prot_conntrack.c 2010-03-09 18:26:22 +0000
@@ -16,11 +16,7 @@
#define _BSD_SOURCE
#include "lib/core/builder.h"
-
-#ifdef HAVE_CONFIG_H
- #include "config.h"
-#endif /* HAVE_CONFIG_H */
-
+#include "config.h"
#include "esp_prot_conntrack.h"
#include "esp_prot_api.h"
#include "hslist.h"
=== modified file 'firewall/firewall.c'
--- firewall/firewall.c 2010-03-08 22:21:34 +0000
+++ firewall/firewall.c 2010-03-09 18:26:22 +0000
@@ -30,10 +30,7 @@
#include <netinet/in.h> /* in_addr, in6_addr */
#include <linux/netfilter_ipv4.h> /* NF_IP_LOCAL_IN, etc */
-#ifdef HAVE_CONFIG_H
- #include "config.h"
-#endif /* HAVE_CONFIG_H */
-
+#include "config.h"
#include "firewall.h" /* default include */
#include "conntrack.h" /* connection tracking */
#include "proxy.h" /* HIP Proxy */
=== modified file 'firewall/firewall.h'
--- firewall/firewall.h 2010-03-07 11:20:52 +0000
+++ firewall/firewall.h 2010-03-09 18:26:22 +0000
@@ -1,10 +1,7 @@
#ifndef HIP_FIREWALL_FIREWALL_H
#define HIP_FIREWALL_FIREWALL_H
-#ifdef HAVE_CONFIG_H
- #include "config.h"
-#endif /* HAVE_CONFIG_H */
-
+#include "config.h"
#include "lib/core/protodefs.h"
/** globally used variables defined in firewall.c */
=== modified file 'firewall/firewall_control.c'
--- firewall/firewall_control.c 2010-03-07 11:20:52 +0000
+++ firewall/firewall_control.c 2010-03-09 18:26:22 +0000
@@ -15,10 +15,7 @@
/* required for s6_addr32 */
#define _BSD_SOURCE
-#ifdef HAVE_CONFIG_H
- #include "config.h"
-#endif /* HAVE_CONFIG_H */
-
+#include "config.h"
#include "firewall_control.h"
#include "firewall.h" /* extern int esp_relay */
#include "proxy.h"
=== modified file 'firewall/firewall_control.h'
--- firewall/firewall_control.h 2010-03-07 11:20:52 +0000
+++ firewall/firewall_control.h 2010-03-09 18:26:22 +0000
@@ -1,10 +1,7 @@
#ifndef HIP_FIREWALL_FIREWALL_CONTROL_H
#define HIP_FIREWALL_FIREWALL_CONTROL_H
-#ifdef HAVE_CONFIG_H
- #include "config.h"
-#endif /* HAVE_CONFIG_H */
-
+#include "config.h"
#include "lib/core/builder.h"
#include "lib/core/protodefs.h"
=== modified file 'firewall/firewall_defines.h'
--- firewall/firewall_defines.h 2010-02-17 17:38:08 +0000
+++ firewall/firewall_defines.h 2010-03-09 18:26:22 +0000
@@ -5,10 +5,7 @@
#include <libipq.h>
#include <string.h>
-#ifdef HAVE_CONFIG_H
- #include "config.h"
-#endif /* HAVE_CONFIG_H */
-
+#include "config.h"
#include "lib/core/linkedlist.h"
#include "lib/core/common_defines.h"
#include "lib/core/esp_prot_common.h"
=== modified file 'firewall/midauth.c'
--- firewall/midauth.c 2010-03-09 08:57:46 +0000
+++ firewall/midauth.c 2010-03-09 18:26:22 +0000
@@ -22,10 +22,7 @@
#include <string.h>
-#ifdef HAVE_CONFIG_H
- #include "config.h"
-#endif /* HAVE_CONFIG_H */
-
+#include "config.h"
#include "lib/core/ife.h"
#include "midauth.h"
#include "pisa.h"
=== modified file 'firewall/pisa.c'
--- firewall/pisa.c 2010-03-05 08:47:53 +0000
+++ firewall/pisa.c 2010-03-09 18:26:22 +0000
@@ -20,10 +20,7 @@
#include <time.h>
#include <stdio.h>
-#ifdef HAVE_CONFIG_H
- #include "config.h"
-#endif /* HAVE_CONFIG_H */
-
+#include "config.h"
#include "lib/core/ife.h"
#include "midauth.h"
#include "lib/core/misc.h"
=== modified file 'firewall/rule_management.c'
--- firewall/rule_management.c 2010-03-08 22:07:59 +0000
+++ firewall/rule_management.c 2010-03-09 18:26:22 +0000
@@ -28,10 +28,7 @@
#include <limits.h>
#include <linux/netfilter_ipv6.h>
-#ifdef HAVE_CONFIG_H
- #include "config.h"
-#endif /* HAVE_CONFIG_H */
-
+#include "config.h"
#include "rule_management.h"
#include "helpers.h"
#include "lib/core/builder.h"
=== modified file 'hipd/accessor.c'
--- hipd/accessor.c 2010-03-07 11:20:52 +0000
+++ hipd/accessor.c 2010-03-09 18:26:22 +0000
@@ -12,10 +12,7 @@
/* required for s6_addr32 */
#define _BSD_SOURCE
-#ifdef HAVE_CONFIG_H
- #include "config.h"
-#endif /* HAVE_CONFIG_H */
-
+#include "config.h"
#include "accessor.h"
=== modified file 'hipd/cert.h'
--- hipd/cert.h 2010-02-17 17:38:08 +0000
+++ hipd/cert.h 2010-03-09 18:26:22 +0000
@@ -23,10 +23,7 @@
#include <openssl/err.h>
#include <openssl/pem.h>
-#ifdef HAVE_CONFIG_H
- #include "config.h"
-#endif /* HAVE_CONFIG_H */
-
+#include "config.h"
#include "lib/core/debug.h"
#include "lib/core/ife.h"
#include "lib/core/misc.h"
=== modified file 'hipd/close.c'
--- hipd/close.c 2010-03-08 22:21:34 +0000
+++ hipd/close.c 2010-03-09 18:26:22 +0000
@@ -4,10 +4,7 @@
/* required for s6_addr32 */
#define _BSD_SOURCE
-#ifdef HAVE_CONFIG_H
- #include "config.h"
-#endif /* HAVE_CONFIG_H */
-
+#include "config.h"
#include "close.h"
#ifdef CONFIG_HIP_PERFORMANCE
#include "lib/performance/performance.h"
=== modified file 'hipd/cookie.c'
--- hipd/cookie.c 2010-03-09 08:57:46 +0000
+++ hipd/cookie.c 2010-03-09 18:26:22 +0000
@@ -12,10 +12,7 @@
/* required for s6_addr32 */
#define _BSD_SOURCE
-#ifdef HAVE_CONFIG_H
- #include "config.h"
-#endif /* HAVE_CONFIG_H */
-
+#include "config.h"
#include "cookie.h"
#include "lib/core/solve.h"
=== modified file 'hipd/hadb.c'
--- hipd/hadb.c 2010-03-09 08:57:46 +0000
+++ hipd/hadb.c 2010-03-09 18:26:22 +0000
@@ -4,10 +4,7 @@
/* required for s6_addr32 */
#define _BSD_SOURCE
-#ifdef HAVE_CONFIG_H
- #include "config.h"
-#endif /* HAVE_CONFIG_H */
-
+#include "config.h"
#include "hadb.h"
#include "hipd.h"
#include "lib/core/list.h"
=== modified file 'hipd/hadb.h'
--- hipd/hadb.h 2010-03-05 08:47:53 +0000
+++ hipd/hadb.h 2010-03-09 18:26:22 +0000
@@ -1,10 +1,7 @@
#ifndef HIP_HIPD_HADB_H
#define HIP_HIPD_HADB_H
-#ifdef HAVE_CONFIG_H
- #include "config.h"
-#endif /* HAVE_CONFIG_H */
-
+#include "config.h"
#include "keymat.h"
#include "lib/tool/pk.h"
#include "lib/core/debug.h"
=== modified file 'hipd/hi3.h'
--- hipd/hi3.h 2010-02-17 17:38:08 +0000
+++ hipd/hi3.h 2010-03-09 18:26:22 +0000
@@ -1,10 +1,7 @@
#ifndef HIP_HIPD_HI3_H
#define HIP_HIPD_HI3_H
-#ifdef HAVE_CONFIG_H
- #include "config.h"
-#endif /* HAVE_CONFIG_H */
-
+#include "config.h"
#include "user.h"
#include "hipd.h"
#include "lib/core/protodefs.h"
=== modified file 'hipd/hidb.c'
--- hipd/hidb.c 2010-03-08 22:07:59 +0000
+++ hipd/hidb.c 2010-03-09 18:26:22 +0000
@@ -12,10 +12,7 @@
/* required for s6_addr32 */
#define _BSD_SOURCE
-#ifdef HAVE_CONFIG_H
- #include "config.h"
-#endif /* HAVE_CONFIG_H */
-
+#include "config.h"
#include "hidb.h"
#include "lib/core/hostid.h"
=== modified file 'hipd/hipd.c'
--- hipd/hipd.c 2010-03-09 16:29:45 +0000
+++ hipd/hipd.c 2010-03-09 18:26:22 +0000
@@ -10,10 +10,7 @@
/* required for s6_addr32 */
#define _BSD_SOURCE
-#ifdef HAVE_CONFIG_H
- #include "config.h"
-#endif /* HAVE_CONFIG_H */
-
+#include "config.h"
#include "hipd.h"
#include "lib/dht/libhipdht.h"
#include "heartbeat.h"
=== modified file 'hipd/hipd.h'
--- hipd/hipd.h 2010-03-07 11:20:52 +0000
+++ hipd/hipd.h 2010-03-09 18:26:22 +0000
@@ -13,10 +13,7 @@
#include <netinet/udp.h>
#include <sys/socket.h>
-#ifdef HAVE_CONFIG_H
- #include "config.h"
-#endif /* HAVE_CONFIG_H */
-
+#include "config.h"
#include "lib/core/crypto.h"
#include "cookie.h"
#include "user.h"
=== modified file 'hipd/hiprelay.c'
--- hipd/hiprelay.c 2010-03-08 22:21:34 +0000
+++ hipd/hiprelay.c 2010-03-09 18:26:22 +0000
@@ -17,10 +17,7 @@
/* required for s6_addr32 */
#define _BSD_SOURCE
-#ifdef HAVE_CONFIG_H
- #include "config.h"
-#endif /* HAVE_CONFIG_H */
-
+#include "config.h"
#include "hiprelay.h"
#include "lib/core/hip_udp.h"
=== modified file 'hipd/hiprelay.h'
--- hipd/hiprelay.h 2010-02-17 17:38:08 +0000
+++ hipd/hiprelay.h 2010-03-09 18:26:22 +0000
@@ -76,10 +76,7 @@
#include <arpa/inet.h> /* For nthos() */
#include <math.h> /* For pow() */
-#ifdef HAVE_CONFIG_H
- #include "config.h"
-#endif /* HAVE_CONFIG_H */
-
+#include "config.h"
#include "lib/core/misc.h" /* For debuging macros. */
#include "registration.h" /* For lifetime conversions. */
#include "configfilereader.h"
=== modified file 'hipd/icookie.c'
--- hipd/icookie.c 2010-03-09 08:57:46 +0000
+++ hipd/icookie.c 2010-03-09 18:26:22 +0000
@@ -8,10 +8,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
- #include "config.h"
-#endif /* HAVE_CONFIG_H */
-
+#include "config.h"
#ifdef CONFIG_HIP_ICOOKIE
#include "icookie.h"
#include "lib/core/solve.h"
=== modified file 'hipd/init.c'
--- hipd/init.c 2010-03-08 22:21:34 +0000
+++ hipd/init.c 2010-03-09 18:26:22 +0000
@@ -12,10 +12,7 @@
#include <sys/types.h>
#include <netinet/icmp6.h>
-#ifdef HAVE_CONFIG_H
- #include "config.h"
-#endif /* HAVE_CONFIG_H */
-
+#include "config.h"
#include "lib/core/common_defines.h"
#include "lib/core/debug.h"
#include "init.h"
=== modified file 'hipd/input.c'
--- hipd/input.c 2010-03-09 16:34:45 +0000
+++ hipd/input.c 2010-03-09 18:26:22 +0000
@@ -17,10 +17,7 @@
/* required for s6_addr32 */
#define _BSD_SOURCE
-#ifdef HAVE_CONFIG_H
- #include "config.h"
-#endif /* HAVE_CONFIG_H */
-
+#include "config.h"
#include "input.h"
#include "hadb.h"
#include "oppdb.h"
=== modified file 'hipd/input.h'
--- hipd/input.h 2010-03-05 08:47:53 +0000
+++ hipd/input.h 2010-03-09 18:26:22 +0000
@@ -15,10 +15,7 @@
#ifndef HIP_HIPD_INPUT_H
#define HIP_HIPD_INPUT_H
-#ifdef HAVE_CONFIG_H
- #include "config.h"
-#endif /* HAVE_CONFIG_H */
-
+#include "config.h"
#ifdef CONFIG_HIP_RVS
#include "hiprelay.h"
#endif
=== modified file 'hipd/maintenance.c'
--- hipd/maintenance.c 2010-03-08 22:21:34 +0000
+++ hipd/maintenance.c 2010-03-09 18:26:22 +0000
@@ -13,10 +13,7 @@
/* required for s6_addr32 */
#define _BSD_SOURCE
-#ifdef HAVE_CONFIG_H
- #include "config.h"
-#endif /* HAVE_CONFIG_H */
-
+#include "config.h"
#include "maintenance.h"
#include "update.h"
#include "heartbeat.h"
=== modified file 'hipd/netdev.c'
--- hipd/netdev.c 2010-03-08 22:21:34 +0000
+++ hipd/netdev.c 2010-03-09 18:26:22 +0000
@@ -21,13 +21,11 @@
/* required for s6_addr32 */
#define _BSD_SOURCE
-#ifdef HAVE_CONFIG_H
- #include "config.h"
-#endif /* HAVE_CONFIG_H */
-
#include <netinet/in.h>
#include <sys/ioctl.h>
#include <ifaddrs.h>
+
+#include "config.h"
#include "lib/tool/nlink.h"
#include "netdev.h"
#include "maintenance.h"
=== modified file 'hipd/netdev.h'
--- hipd/netdev.h 2010-03-03 13:16:18 +0000
+++ hipd/netdev.h 2010-03-09 18:26:22 +0000
@@ -8,10 +8,7 @@
#include <sys/socket.h>
#include <netinet/ip6.h>
#include <openssl/rand.h>
-#ifdef HAVE_CONFIG_H
- #include "config.h"
-#endif /* HAVE_CONFIG_H */
-
+#include "config.h"
#include "lib/tool/nlink.h"
#include "lib/core/list.h"
#include "lib/core/debug.h"
=== modified file 'hipd/nsupdate.c'
--- hipd/nsupdate.c 2010-02-17 17:38:08 +0000
+++ hipd/nsupdate.c 2010-03-09 18:26:22 +0000
@@ -24,10 +24,7 @@
#include <string.h>
#include <sys/resource.h> // for getrlimit
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
+#include "config.h"
#include "hidb.h"
#include "nsupdate.h"
=== modified file 'hipd/oppdb.c'
--- hipd/oppdb.c 2010-03-03 13:16:18 +0000
+++ hipd/oppdb.c 2010-03-09 18:26:22 +0000
@@ -10,10 +10,7 @@
/* required for s6_addr32 */
#define _BSD_SOURCE
-#ifdef HAVE_CONFIG_H
- #include "config.h"
-#endif /* HAVE_CONFIG_H */
-
+#include "config.h"
#ifdef CONFIG_HIP_OPPORTUNISTIC
#include "oppdb.h"
=== modified file 'hipd/oppipdb.c'
--- hipd/oppipdb.c 2010-02-17 17:38:08 +0000
+++ hipd/oppipdb.c 2010-03-09 18:26:22 +0000
@@ -14,10 +14,7 @@
/* required for s6_addr32 */
#define _BSD_SOURCE
-#ifdef HAVE_CONFIG_H
- #include "config.h"
-#endif /* HAVE_CONFIG_H */
-
+#include "config.h"
#ifdef CONFIG_HIP_OPPORTUNISTIC
#include "oppipdb.h"
=== modified file 'hipd/output.c'
--- hipd/output.c 2010-03-08 22:21:34 +0000
+++ hipd/output.c 2010-03-09 18:26:22 +0000
@@ -16,10 +16,7 @@
#include <netinet/icmp6.h>
-#ifdef HAVE_CONFIG_H
- #include "config.h"
-#endif /* HAVE_CONFIG_H */
-
+#include "config.h"
#include "output.h"
#ifdef CONFIG_HIP_PERFORMANCE
#include "lib/performance/performance.h"
=== modified file 'hipd/output.h'
--- hipd/output.h 2010-02-17 17:38:08 +0000
+++ hipd/output.h 2010-03-09 18:26:22 +0000
@@ -17,10 +17,7 @@
#include <unistd.h>
#include <string.h>
-#ifdef HAVE_CONFIG_H
- #include "config.h"
-#endif /* HAVE_CONFIG_H */
-
+#include "config.h"
#include "dh.h"
#include "hidb.h"
#include "hadb.h"
=== modified file 'hipd/pfkeyapi.c'
--- hipd/pfkeyapi.c 2010-03-09 16:39:01 +0000
+++ hipd/pfkeyapi.c 2010-03-09 18:26:22 +0000
@@ -8,12 +8,10 @@
/* required for caddr_t */
#define _BSD_SOURCE
-#ifdef HAVE_CONFIG_H
- #include "config.h"
-#endif /* HAVE_CONFIG_H */
-
#include <linux/pfkeyv2.h>
#include <linux/ipsec.h>
+
+#include "config.h"
#include "lib/ipsec/libpfkey.h"
#include "pfkeyapi.h"
=== modified file 'hipd/pfkeyapi.h'
--- hipd/pfkeyapi.h 2010-02-17 13:08:39 +0000
+++ hipd/pfkeyapi.h 2010-03-09 18:26:22 +0000
@@ -1,10 +1,7 @@
#ifndef HIP_HIPD_PFKEYAPI_H
#define HIP_HIPD_PFKEYAPI_H
-#ifdef HAVE_CONFIG_H
- #include "config.h"
-#endif /* HAVE_CONFIG_H */
-
+#include "config.h"
#include "lib/tool/xfrmapi.h"
#endif /* HIP_HIPD_PFKEYAPI_H */
=== modified file 'hipd/update.c'
--- hipd/update.c 2010-03-09 08:57:46 +0000
+++ hipd/update.c 2010-03-09 18:26:22 +0000
@@ -13,10 +13,7 @@
/* requiread for s6_addr32 */
#define _BSD_SOURCE
-#ifdef HAVE_CONFIG_H
- #include "config.h"
-#endif /* HAVE_CONFIG_H */
-
+#include "config.h"
#include "update.h"
#include "lib/core/protodefs.h"
=== modified file 'hipd/user.c'
--- hipd/user.c 2010-03-08 22:21:34 +0000
+++ hipd/user.c 2010-03-09 18:26:22 +0000
@@ -16,10 +16,7 @@
/* required for s6_addr32 */
#define _BSD_SOURCE
-#ifdef HAVE_CONFIG_H
- #include "config.h"
-#endif /* HAVE_CONFIG_H */
-
+#include "config.h"
#include "user.h"
#include "esp_prot_anchordb.h"
#include "lib/dht/libhipdht.h"
=== modified file 'i3/i3_client/i3_client_trigger.c'
--- i3/i3_client/i3_client_trigger.c 2010-02-17 17:38:08 +0000
+++ i3/i3_client/i3_client_trigger.c 2010-03-09 18:26:22 +0000
@@ -18,10 +18,7 @@
#include <sys/time.h>
#endif
-#ifdef HAVE_CONFIG_H
- #include "config.h"
-#endif /* HAVE_CONFIG_H */
-
+#include "config.h"
#include "../i3/i3.h"
#include "../i3/i3_fun.h"
=== modified file 'lib/android/regex.c'
--- lib/android/regex.c 2010-02-18 14:58:39 +0000
+++ lib/android/regex.c 2010-03-09 18:26:22 +0000
@@ -27,9 +27,7 @@
#undef _GNU_SOURCE
#define _GNU_SOURCE
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
/* We need this for `regex.h', and perhaps for the Emacs include files. */
#include <sys/types.h>
=== modified file 'lib/conf/hipconf.c'
--- lib/conf/hipconf.c 2010-03-08 22:07:59 +0000
+++ lib/conf/hipconf.c 2010-03-09 18:26:22 +0000
@@ -35,11 +35,9 @@
/* required for ifreq */
#define _BSD_SOURCE
-#ifdef HAVE_CONFIG_H
- #include "config.h"
-#endif /* HAVE_CONFIG_H */
-
#include <sys/ioctl.h>
+
+#include "config.h"
#include "lib/core/builder.h"
#include "lib/core/debug.h"
#include "hipconf.h"
=== modified file 'lib/conf/hipconf.h'
--- lib/conf/hipconf.h 2010-02-17 17:38:08 +0000
+++ lib/conf/hipconf.h 2010-03-09 18:26:22 +0000
@@ -15,11 +15,9 @@
#ifndef HIP_LIB_CONF_HIPCONF_H
#define HIP_LIB_CONF_HIPCONF_H
-#ifdef HAVE_CONFIG_H
- #include "config.h"
-#endif /* HAVE_CONFIG_H */
-
#include <stdlib.h>
+
+#include "config.h"
#include "lib/core/protodefs.h"
/*
=== modified file 'lib/core/builder.c'
--- lib/core/builder.c 2010-03-08 22:07:59 +0000
+++ lib/core/builder.c 2010-03-09 18:26:22 +0000
@@ -68,10 +68,7 @@
/* required for s6_addr32 */
#define _BSD_SOURCE
-#ifdef HAVE_CONFIG_H
- #include <config.h>
-#endif /* HAVE_CONFIG_H */
-
+#include "config.h"
#include "builder.h"
#include "hipd/input.h"
#include "lib/core/crypto.h"
=== modified file 'lib/core/builder.h'
--- lib/core/builder.h 2010-03-08 21:21:01 +0000
+++ lib/core/builder.h 2010-03-09 18:26:22 +0000
@@ -13,10 +13,7 @@
#include <openssl/rsa.h>
#include <openssl/dsa.h>
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif /* HAVE_CONFIG_H */
-
+#include "config.h"
#include "debug.h"
#include "misc.h"
#include "icomm.h"
=== modified file 'lib/core/certtools.h'
--- lib/core/certtools.h 2010-02-17 17:38:08 +0000
+++ lib/core/certtools.h 2010-03-09 18:26:22 +0000
@@ -22,10 +22,8 @@
#include <openssl/conf.h>
#include <openssl/x509.h>
#include <openssl/x509v3.h>
-#ifdef HAVE_CONFIG_H
- #include "config.h"
-#endif /* HAVE_CONFIG_H */
+#include "config.h"
#include "debug.h"
#include "ife.h"
#include "misc.h"
=== modified file 'lib/core/crypto.c'
--- lib/core/crypto.c 2010-03-08 21:21:01 +0000
+++ lib/core/crypto.c 2010-03-09 18:26:22 +0000
@@ -31,10 +31,7 @@
/* required for s6_addr32 */
#define _BSD_SOURCE
-#ifdef HAVE_CONFIG_H
- #include "config.h"
-#endif /* HAVE_CONFIG_H */
-
+#include "config.h"
#include "crypto.h"
#ifdef CONFIG_HIP_PERFORMANCE
=== modified file 'lib/core/crypto.h'
--- lib/core/crypto.h 2010-03-09 16:09:38 +0000
+++ lib/core/crypto.h 2010-03-09 18:26:22 +0000
@@ -1,10 +1,6 @@
#ifndef HIP_LIB_CORE_CRYPTO_H
#define HIP_LIB_CORE_CRYPTO_H
-#ifdef HAVE_CONFIG_H
- #include "config.h"
-#endif /* HAVE_CONFIG_H */
-
#include <sys/time.h>
#include <time.h>
#include <openssl/dsa.h>
@@ -26,6 +22,7 @@
#include <string.h>
#include <netinet/in.h>
+#include "config.h"
#include "hipd/hidb.h"
#include "lib/core/debug.h"
#include "lib/core/transform.h"
=== modified file 'lib/core/debug.c'
--- lib/core/debug.c 2010-03-03 13:16:18 +0000
+++ lib/core/debug.c 2010-03-09 18:26:22 +0000
@@ -49,10 +49,7 @@
/* required for s6_addr32 */
#define _BSD_SOURCE
-#ifdef HAVE_CONFIG_H
- #include "config.h"
-#endif /* HAVE_CONFIG_H */
-
+#include "config.h"
#include "debug.h"
#include "lib/tool/lutil.h"
#include "lib/conf/hipconf.h"
=== modified file 'lib/core/debug.h'
--- lib/core/debug.h 2010-03-03 13:16:18 +0000
+++ lib/core/debug.h 2010-03-09 18:26:22 +0000
@@ -9,10 +9,7 @@
#include <stdlib.h>
#include <assert.h>
#include <netinet/in.h>
-#ifdef HAVE_CONFIG_H
- #include "config.h"
-#endif /* HAVE_CONFIG_H */
-
+#include "config.h"
#include "protodefs.h"
#include "prefix.h"
#include "ife.h"
=== modified file 'lib/core/filemanip.c'
--- lib/core/filemanip.c 2010-03-08 22:07:59 +0000
+++ lib/core/filemanip.c 2010-03-09 18:26:22 +0000
@@ -10,11 +10,9 @@
#include "filemanip.h"
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif /* HAVE_CONFIG_H */
-
#include <unistd.h>
+
+#include "config.h"
#include "crypto.h"
/**
=== modified file 'lib/core/filemanip.h'
--- lib/core/filemanip.h 2010-03-09 15:29:33 +0000
+++ lib/core/filemanip.h 2010-03-09 18:26:22 +0000
@@ -3,9 +3,7 @@
#include <sys/types.h>
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif /* HAVE_CONFIG_H */
+#include "config.h"
int hip_create_lock_file(char *filename, int killold);
int hip_remove_lock_file(char *filename);
=== modified file 'lib/core/hip_capability.c'
--- lib/core/hip_capability.c 2010-03-03 13:16:18 +0000
+++ lib/core/hip_capability.c 2010-03-09 18:26:22 +0000
@@ -19,10 +19,7 @@
#define _BSD_SOURCE
-#ifdef HAVE_CONFIG_H
- #include "config.h"
-#endif /* HAVE_CONFIG_H */
-
+#include "config.h"
#ifdef CONFIG_HIP_PRIVSEP
#ifdef CONFIG_HIP_ALTSEP
/* Note: OpenWRT has to use <linux/capability.h> */
=== modified file 'lib/core/hostid.c'
--- lib/core/hostid.c 2010-03-08 22:07:59 +0000
+++ lib/core/hostid.c 2010-03-09 18:26:22 +0000
@@ -8,16 +8,14 @@
* @author Miika Komu <miika@xxxxxx>
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif /* HAVE_CONFIG_H */
-
#include <netinet/in.h>
#include <lib/core/ife.h>
#include <lib/core/debug.h>
#include <lib/core/protodefs.h>
#include <lib/core/crypto.h>
#include <stdlib.h>
+
+#include "config.h"
#include "hostid.h"
#include "filemanip.h"
=== modified file 'lib/core/hostid.h'
--- lib/core/hostid.h 2010-03-08 22:07:59 +0000
+++ lib/core/hostid.h 2010-03-09 18:26:22 +0000
@@ -1,9 +1,7 @@
#ifndef HIP_LIB_CORE_HOSTID_H
#define HIP_LIB_CORE_HOSTID_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif /* HAVE_CONFIG_H */
+#include "config.h"
int hip_dsa_host_id_to_hit(const struct hip_host_id *host_id,
struct in6_addr *hit, int hit_type);
=== modified file 'lib/core/hostsfiles.c'
--- lib/core/hostsfiles.c 2010-03-08 17:29:23 +0000
+++ lib/core/hostsfiles.c 2010-03-09 18:26:22 +0000
@@ -18,15 +18,12 @@
/* required for s6_addr32 */
#define _BSD_SOURCE
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif /* HAVE_CONFIG_H */
-
#include <arpa/inet.h>
#include <time.h>
#include <netinet/in.h>
+
+#include "config.h"
#include "misc.h"
-
#include "hostsfiles.h"
=== modified file 'lib/core/hostsfiles.h'
--- lib/core/hostsfiles.h 2010-03-08 17:29:23 +0000
+++ lib/core/hostsfiles.h 2010-03-09 18:26:22 +0000
@@ -1,10 +1,7 @@
#ifndef HIP_LIB_CORE_HOSTSFILES_H
#define HIP_LIB_CORE_HOSTSFILES_H
-#ifdef HAVE_CONFIG_H
- #include "config.h"
-#endif /* HAVE_CONFIG_H */
-
+#include "config.h"
#include "prefix.h"
#include "lib/conf/hipconf.h"
//#include "misc.h"
=== modified file 'lib/core/message.h'
--- lib/core/message.h 2010-03-03 13:16:18 +0000
+++ lib/core/message.h 2010-03-09 18:26:22 +0000
@@ -9,17 +9,10 @@
#ifndef HIP_LIB_CORE_MESSAGE_H
#define HIP_LIB_CORE_MESSAGE_H
-#if HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <errno.h>
#include <netinet/in.h>
-#ifdef HAVE_CONFIG_H
- #include "config.h"
-#endif /* HAVE_CONFIG_H */
-
+#include "config.h"
#include "lib/tool/nlink.h"
#include "debug.h"
#include "icomm.h"
=== modified file 'lib/core/misc.c'
--- lib/core/misc.c 2010-03-09 16:09:38 +0000
+++ lib/core/misc.c 2010-03-09 18:26:22 +0000
@@ -10,13 +10,10 @@
/* required for s6_addr32 */
#define _BSD_SOURCE
-#ifdef HAVE_CONFIG_H
- #include "config.h"
-#endif /* HAVE_CONFIG_H */
-
#include <string.h>
+
+#include "config.h"
#include "filemanip.h"
-
#include "misc.h"
#include "prefix.h"
=== modified file 'lib/core/misc.h'
--- lib/core/misc.h 2010-03-09 16:09:38 +0000
+++ lib/core/misc.h 2010-03-09 18:26:22 +0000
@@ -10,13 +10,10 @@
#ifndef HIP_LIB_CORE_MISC_H
#define HIP_LIB_CORE_MISC_H
-#ifdef HAVE_CONFIG_H
- #include "config.h"
-#endif /* HAVE_CONFIG_H */
+#include <string.h>
+#include "config.h"
#include "hipd/hidb.h"
-
-#include <string.h>
#include "hipd/registration.h"
#include "lib/core/prefix.h"
#include "icomm.h"
=== modified file 'lib/core/prefix.h'
--- lib/core/prefix.h 2010-03-08 21:21:01 +0000
+++ lib/core/prefix.h 2010-03-09 18:26:22 +0000
@@ -1,12 +1,10 @@
#ifndef HIP_LIB_CORE_UTILS_H
#define HIP_LIB_CORE_UTILS_H
-#ifdef HAVE_CONFIG_H
- #include "config.h"
-#endif /* HAVE_CONFIG_H */
-
#include <sys/un.h>
#include <stdlib.h>
+
+#include "config.h"
#include "protodefs.h"
#include "list.h"
#include "debug.h"
=== modified file 'lib/core/solve.h'
--- lib/core/solve.h 2010-03-09 08:57:46 +0000
+++ lib/core/solve.h 2010-03-09 18:26:22 +0000
@@ -1,11 +1,9 @@
#ifndef HIP_LIB_CORE_SOLVE_H
#define HIP_LIB_CORE_SOLVE_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif /* HAVE_CONFIG_H */
-
#include <sys/types.h>
+
+#include "config.h"
#include "lib/core/crypto.h"
#include "protodefs.h"
#include "state.h"
=== modified file 'lib/core/sqlitedbapi.c'
--- lib/core/sqlitedbapi.c 2010-02-17 17:38:08 +0000
+++ lib/core/sqlitedbapi.c 2010-03-09 18:26:22 +0000
@@ -5,10 +5,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
- #include "config.h"
-#endif /* HAVE_CONFIG_H */
-
+#include "config.h"
#ifdef CONFIG_HIP_AGENT
#include "sqlitedbapi.h"
=== modified file 'lib/core/sqlitedbapi.h'
--- lib/core/sqlitedbapi.h 2010-02-17 17:38:08 +0000
+++ lib/core/sqlitedbapi.h 2010-03-09 18:26:22 +0000
@@ -15,10 +15,8 @@
#include <stdio.h>
#include <sqlite3.h>
-#ifdef HAVE_CONFIG_H
- #include "config.h"
-#endif /* HAVE_CONFIG_H */
+#include "config.h"
#include "debug.h"
#include "ife.h"
=== modified file 'lib/core/state.h'
--- lib/core/state.h 2010-03-05 09:10:50 +0000
+++ lib/core/state.h 2010-03-09 18:26:22 +0000
@@ -7,10 +7,7 @@
#ifndef HIP_LIB_CORE_STATE_H
#define HIP_LIB_CORE_STATE_H
-#ifdef HAVE_CONFIG_H
- #include "config.h"
-#endif /* HAVE_CONFIG_H */
-
+#include "config.h"
#include "hashtable.h"
#include "esp_prot_common.h"
#include "hip_statistics.h"
=== modified file 'lib/core/transform.h'
--- lib/core/transform.h 2010-03-09 16:09:38 +0000
+++ lib/core/transform.h 2010-03-09 18:26:22 +0000
@@ -1,12 +1,9 @@
#ifndef HIP_LIB_CORE_TRANSFORM_H
#define HIP_LIB_CORE_TRANSFORM_H
+#include "config.h"
#include "protodefs.h"
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif /* HAVE_CONFIG_H */
-
hip_transform_suite_t hip_select_esp_transform(struct hip_esp_transform *ht);
hip_transform_suite_t hip_select_hip_transform(struct hip_hip_transform *ht);
int hip_transform_key_length(int tid);
=== modified file 'lib/dht/libhipdht.h'
--- lib/dht/libhipdht.h 2010-02-17 17:38:08 +0000
+++ lib/dht/libhipdht.h 2010-03-09 18:26:22 +0000
@@ -1,11 +1,7 @@
#ifndef HIP_LIB_DHT_LIBHIPDHT_H
#define HIP_LIB_DHT_LIBHIPDHT_H
-#ifdef HAVE_CONFIG_H
- #include "config.h"
-#endif /* HAVE_CONFIG_H */
-
-
+#include "config.h"
#include "lib/core/protodefs.h"
/* Resolve the gateway address using opendht.nyuld.net */
=== modified file 'lib/ipsec/ipsec_strerror.c'
--- lib/ipsec/ipsec_strerror.c 2010-03-03 13:16:18 +0000
+++ lib/ipsec/ipsec_strerror.c 2010-03-09 18:26:22 +0000
@@ -31,16 +31,13 @@
* SUCH DAMAGE.
*/
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
#include <sys/types.h>
#include <sys/param.h>
-
#include <string.h>
#include <inttypes.h>
#include <linux/ipsec.h>
+
+#include "config.h"
#include "ipsec_strerror.h"
int __ipsec_errcode;
=== modified file 'lib/ipsec/pfkey.c'
--- lib/ipsec/pfkey.c 2010-03-05 08:24:06 +0000
+++ lib/ipsec/pfkey.c 2010-03-09 18:26:22 +0000
@@ -34,10 +34,6 @@
/* required for caddr_t */
#define _BSD_SOURCE
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
#include <sys/types.h>
#include <sys/param.h>
#include <sys/socket.h>
@@ -51,6 +47,7 @@
#include <errno.h>
#include <stdio.h>
+#include "config.h"
#include "ipsec_strerror.h"
#include "libpfkey.h"
#include "linux/pfkeyv2.h"
=== modified file 'lib/ipsec/policy_parse.c'
--- lib/ipsec/policy_parse.c 2010-03-03 13:16:18 +0000
+++ lib/ipsec/policy_parse.c 2010-03-09 18:26:22 +0000
@@ -44,10 +44,6 @@
#define YYPREFIX "__libipsec"
#line 64 "policy_parse.y"
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
#include <sys/types.h>
#include <sys/param.h>
#include <sys/socket.h>
@@ -62,6 +58,7 @@
#include <errno.h>
+#include "config.h"
#include "ipsec_strerror.h"
#include "libpfkey.h"
=== modified file 'lib/ipsec/policy_parse.y'
--- lib/ipsec/policy_parse.y 2010-03-05 08:24:06 +0000
+++ lib/ipsec/policy_parse.y 2010-03-09 18:26:22 +0000
@@ -64,10 +64,6 @@
%{
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
#include <sys/types.h>
#include <sys/param.h>
#include <sys/socket.h>
@@ -82,8 +78,7 @@
#include <errno.h>
-//#include "config.h"
-
+#include "config.h"
#include "ipsec_strerror.h"
#include "libpfkey.h"
#include "linux/pfkeyv2.h"
=== modified file 'lib/ipsec/policy_token.l'
--- lib/ipsec/policy_token.l 2010-03-03 13:16:18 +0000
+++ lib/ipsec/policy_token.l 2010-03-09 18:26:22 +0000
@@ -32,12 +32,10 @@
*/
%{
+#include "config.h"
+
#ifdef CONFIG_HIP_PFKEY
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
#include <sys/types.h>
#include <sys/param.h>
#include <sys/socket.h>
=== modified file 'lib/opphip/wrap.c'
--- lib/opphip/wrap.c 2010-03-05 08:24:06 +0000
+++ lib/opphip/wrap.c 2010-03-09 18:26:22 +0000
@@ -15,10 +15,6 @@
/* required for s6_addr32 */
#define _BSD_SOURCE
-#ifdef HAVE_CONFIG_H
- #include "config.h"
-#endif /* HAVE_CONFIG_H */
-
#include <sys/types.h>
#include <unistd.h>
#include <errno.h>
@@ -27,6 +23,7 @@
#include <pthread.h>
#include <poll.h>
+#include "config.h"
#include "lib/core/debug.h"
#include "hipd/hadb.h"
#include "lib/core/hashtable.h"
=== modified file 'lib/opphip/wrap_db.c'
--- lib/opphip/wrap_db.c 2010-02-17 17:38:08 +0000
+++ lib/opphip/wrap_db.c 2010-03-09 18:26:22 +0000
@@ -11,10 +11,6 @@
/* required for s6_addr32 */
#define _BSD_SOURCE
-#ifdef HAVE_CONFIG_H
- #include "config.h"
-#endif /* HAVE_CONFIG_H */
-
#include <sys/types.h>
#include <unistd.h>
#include <errno.h>
@@ -22,6 +18,7 @@
#include <sys/socket.h>
#include <pthread.h>
+#include "config.h"
#include "lib/core/hashtable.h"
#include "hipd/hadb.h"
#include "wrap_db.h"
=== modified file 'lib/tool/lutil.h'
--- lib/tool/lutil.h 2010-03-08 21:42:08 +0000
+++ lib/tool/lutil.h 2010-03-09 18:26:22 +0000
@@ -7,10 +7,6 @@
#ifndef HIP_LIB_TOOL_LUTIL_H
#define HIP_LIB_TOOL_LUTIL_H
-#ifdef HAVE_CONFIG_H
- #include "config.h"
-#endif /* HAVE_CONFIG_H */
-
#include <dirent.h>
#include <sys/stat.h>
#include <unistd.h>
@@ -20,6 +16,7 @@
#include <stdlib.h>
#include <malloc.h>
+#include "config.h"
#include "lib/core/builder.h"
#include "lib/core/debug.h"
=== modified file 'lib/tool/nlink.c'
--- lib/tool/nlink.c 2010-03-05 08:57:28 +0000
+++ lib/tool/nlink.c 2010-03-09 18:26:22 +0000
@@ -30,11 +30,9 @@
/* required for s6_addr32 */
#define _BSD_SOURCE
-#ifdef HAVE_CONFIG_H
- #include "config.h"
-#endif /* HAVE_CONFIG_H */
-
#include <sys/ioctl.h>
+
+#include "config.h"
#include "nlink.h"
/* New one to prevent netlink overrun */
=== modified file 'lib/tool/pk.c'
--- lib/tool/pk.c 2010-03-05 08:47:53 +0000
+++ lib/tool/pk.c 2010-03-09 18:26:22 +0000
@@ -13,10 +13,7 @@
/* required for s6_addr32 */
#define _BSD_SOURCE
-#ifdef HAVE_CONFIG_H
- #include "config.h"
-#endif /* HAVE_CONFIG_H */
-
+#include "config.h"
#include "pk.h"
#ifdef CONFIG_HIP_PERFORMANCE
=== modified file 'lib/tool/xfrmapi.c'
--- lib/tool/xfrmapi.c 2010-03-08 22:21:34 +0000
+++ lib/tool/xfrmapi.c 2010-03-09 18:26:22 +0000
@@ -16,10 +16,7 @@
/* required for s6_addr32 */
#define _BSD_SOURCE
-#ifdef HAVE_CONFIG_H
- #include "config.h"
-#endif /* HAVE_CONFIG_H */
-
+#include "config.h"
#include "lib/tool/nlink.h"
#include "lib/core/hip_udp.h"
=== modified file 'test/auth_performance.c'
--- test/auth_performance.c 2010-03-09 16:45:35 +0000
+++ test/auth_performance.c 2010-03-09 18:26:22 +0000
@@ -16,10 +16,8 @@
#include <stdio.h> /* printf & co */
#include <stdlib.h> /* exit & co */
#include <unistd.h>
-#ifdef HAVE_CONFIG_H
- #include "config.h"
-#endif /* HAVE_CONFIG_H */
+#include "config.h"
#include "lib/core/hip_statistics.h"
#include "lib/core/crypto.h"
=== modified file 'test/conntest-client-hip.c'
--- test/conntest-client-hip.c 2010-03-05 08:24:06 +0000
+++ test/conntest-client-hip.c 2010-03-09 18:26:22 +0000
@@ -9,10 +9,6 @@
/* required for s6_addr32 */
#define _BSD_SOURCE
-#if HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -25,6 +21,8 @@
#include <netdb.h>
#include <sys/time.h>
#include <time.h>
+
+#include "config.h"
#include "lib/core/debug.h"
#include "lib/core/ife.h"
#include "conntest.h"
=== modified file 'test/conntest-client-native.c'
--- test/conntest-client-native.c 2010-02-17 17:38:08 +0000
+++ test/conntest-client-native.c 2010-03-09 18:26:22 +0000
@@ -18,10 +18,6 @@
/* required for s6_addr32 */
#define _BSD_SOURCE
-#if HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -36,9 +32,10 @@
#include <time.h>
#include <arpa/inet.h>
#include <net/if.h>
+
+#include "config.h"
#include "lib/core/debug.h"
#include "lib/core/ife.h"
-
#include "conntest.h"
int main(int argc, char *argv[])
=== modified file 'test/conntest-client-opp.c'
--- test/conntest-client-opp.c 2010-02-17 17:38:08 +0000
+++ test/conntest-client-opp.c 2010-03-09 18:26:22 +0000
@@ -7,10 +7,6 @@
/* required for s6_addr32 */
#define _BSD_SOURCE
-#if HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -23,6 +19,8 @@
#include <netdb.h>
#include <sys/time.h>
#include <time.h>
+
+#include "config.h"
#include "lib/core/debug.h"
#include "lib/core/ife.h"
#include "conntest.h"
=== modified file 'test/conntest-server.c'
--- test/conntest-server.c 2010-02-17 17:38:08 +0000
+++ test/conntest-server.c 2010-03-09 18:26:22 +0000
@@ -12,10 +12,6 @@
/* required for s6_addr32 */
#define _BSD_SOURCE
-#if HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -31,6 +27,8 @@
# define __user
#endif
#include <signal.h>
+
+#include "config.h"
#include "conntest.h"
static void sig_handler(int signo)
=== modified file 'test/dh_performance.c'
--- test/dh_performance.c 2010-03-09 16:31:13 +0000
+++ test/dh_performance.c 2010-03-09 18:26:22 +0000
@@ -19,10 +19,7 @@
#include <openssl/sha.h> /* open ssl library for SHA operations */
#include <openssl/dsa.h> /* open ssl library for DSA operations */
-#ifdef HAVE_CONFIG_H
- #include "config.h"
-#endif /* HAVE_CONFIG_H */
-
+#include "config.h"
#include "lib/core/crypto.h"
#include "lib/core/filemanip.h"
#include "lib/core/hashchain.h"
=== modified file 'test/sqliteteststub.c'
--- test/sqliteteststub.c 2010-03-03 13:16:18 +0000
+++ test/sqliteteststub.c 2010-03-09 18:26:22 +0000
@@ -10,10 +10,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
- #include "config.h"
-#endif /* HAVE_CONFIG_H */
-
+#include "config.h"
#ifdef CONFIG_HIP_AGENT
#include "lib/core/prefix.h"
Other related posts:
- » [hipl-commit] [trunk] Rev 3886: Remove pointless #ifdef guards around config.h #include. - Diego Biurrun
