[hipl-commit] [trunk] Rev 4405: cosmetics: Consistently format all multiple inclusion guards in headers.

  • From: Diego Biurrun <diego@xxxxxxxxxx>
  • To: hipl-commit@xxxxxxxxxxxxx
  • Date: Thu, 22 Apr 2010 13:13:18 +0300

Committer: Diego Biurrun <diego@xxxxxxxxxx>
Date: 22/04/2010 at 13:13:18
Revision: 4405
Revision-id: diego@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
Branch nick: trunk

Log:
  cosmetics: Consistently format all multiple inclusion guards in headers.

Modified:
  M  agent/connhipd.h
  M  agent/hitdb.h
  M  agent/language.h
  M  agent/str_var.h
  M  agent/tools.h
  M  firewall/cache.h
  M  firewall/cache_port.h
  M  firewall/common_hipd_msg.h
  M  firewall/common_types.h
  M  firewall/conntrack.h
  M  firewall/datapkt.h
  M  firewall/dlist.h
  M  firewall/esp_prot_defines.h
  M  firewall/firewall.h
  M  firewall/firewall_control.h
  M  firewall/firewall_defines.h
  M  firewall/firewalldb.h
  M  firewall/helpers.h
  M  firewall/hslist.h
  M  firewall/lsi.h
  M  firewall/opptcp.h
  M  firewall/proxy.h
  M  firewall/proxyconndb.h
  M  firewall/proxydb.h
  M  firewall/rule_management.h
  M  firewall/sysopp.h
  M  hipd/accessor.h
  M  hipd/blind.h
  M  hipd/bos.h
  M  hipd/cert.h
  M  hipd/close.h
  M  hipd/configfilereader.h
  M  hipd/cookie.h
  M  hipd/dh.h
  M  hipd/dht.h
  M  hipd/hadb.h
  M  hipd/hadb_legacy.h
  M  hipd/heartbeat.h
  M  hipd/hi3.h
  M  hipd/hidb.h
  M  hipd/hipd.h
  M  hipd/hiprelay.h
  M  hipd/init.h
  M  hipd/input.h
  M  hipd/keymat.h
  M  hipd/maintenance.h
  M  hipd/nat.h
  M  hipd/netdev.h
  M  hipd/output.h
  M  hipd/pfkeyapi.h
  M  hipd/pisa.h
  M  hipd/registration.h
  M  hipd/update.h
  M  hipd/update_legacy.h
  M  hipd/user.h
  M  lib/conf/hipconf.h
  M  lib/core/builder.h
  M  lib/core/certtools.h
  M  lib/core/crypto.h
  M  lib/core/debug.h
  M  lib/core/filemanip.h
  M  lib/core/hip_capability.h
  M  lib/core/hip_statistics.h
  M  lib/core/hip_udp.h
  M  lib/core/hit.h
  M  lib/core/hostid.h
  M  lib/core/hostsfiles.h
  M  lib/core/icomm.h
  M  lib/core/ife.h
  M  lib/core/keylen.h
  M  lib/core/linkedlist.h
  M  lib/core/list.h
  M  lib/core/message.h
  M  lib/core/performance.h
  M  lib/core/protodefs.h
  M  lib/core/solve.h
  M  lib/core/sqlitedbapi.h
  M  lib/core/state.h
  M  lib/core/straddr.h
  M  lib/core/transform.h
  M  lib/dht/libhipdht.h
  M  lib/dht/libhipdhtxml.h
  M  lib/gui/dragndrop.h
  M  lib/gui/events.h
  M  lib/gui/hipgui.h
  M  lib/gui/tools.h
  M  lib/gui/widgets.h
  M  lib/opphip/wrap_db.h
  M  lib/tool/lutil.h
  M  lib/tool/xfrmapi.h
  M  test/conntest.h

=== modified file 'agent/connhipd.h'
--- agent/connhipd.h    2010-04-21 17:30:23 +0000
+++ agent/connhipd.h    2010-04-22 10:12:54 +0000
@@ -13,4 +13,4 @@
 int connhipd_run_thread(void);
 void connhipd_quit(void);
 
-#endif /*HIP_AGENT_CONNHIPD_H */
+#endif /* HIP_AGENT_CONNHIPD_H */

=== modified file 'agent/hitdb.h'
--- agent/hitdb.h       2010-04-21 17:30:23 +0000
+++ agent/hitdb.h       2010-04-22 10:12:54 +0000
@@ -3,6 +3,7 @@
  *
  * Distributed under <a href="http://www.gnu.org/licenses/gpl2.txt";>GNU/GPL</a>
  */
+
 #ifndef HIP_AGENT_HITDB_H
 #define HIP_AGENT_HITDB_H
 

=== modified file 'agent/language.h'
--- agent/language.h    2010-02-17 17:38:08 +0000
+++ agent/language.h    2010-04-22 10:12:54 +0000
@@ -4,6 +4,7 @@
  *  License: GNU/GPL
  *  Authors: Antti Partanen <aehparta@xxxxxxxxx>
  */
+
 #ifndef HIP_AGENT_LANGUAGE_H
 #define HIP_AGENT_LANGUAGE_H
 

=== modified file 'agent/str_var.h'
--- agent/str_var.h     2010-02-17 17:38:08 +0000
+++ agent/str_var.h     2010-04-22 10:12:54 +0000
@@ -1,5 +1,3 @@
-#ifndef HIP_AGENT_STR_VAR_H
-#define HIP_AGENT_STR_VAR_H
 /*
  *  HIP Agent
  *
@@ -7,6 +5,9 @@
  *  Authors: Antti Partanen <aehparta@xxxxxxxxx>
  */
 
+#ifndef HIP_AGENT_STR_VAR_H
+#define HIP_AGENT_STR_VAR_H
+
 /** Maximum length of normal string. */
 #define MAX_STRING                      260
 

=== modified file 'agent/tools.h'
--- agent/tools.h       2010-04-22 10:10:34 +0000
+++ agent/tools.h       2010-04-22 10:12:54 +0000
@@ -1,5 +1,3 @@
-#ifndef HIP_AGENT_TOOLS_H
-#define HIP_AGENT_TOOLS_H
 /*
  *  HIP Agent
  *
@@ -7,6 +5,9 @@
  *  Authors: Antti Partanen <aehparta@xxxxxxxxx>
  */
 
+#ifndef HIP_AGENT_TOOLS_H
+#define HIP_AGENT_TOOLS_H
+
 #include <netinet/in.h>
 
 void agent_exit(void);

=== modified file 'firewall/cache.h'
--- firewall/cache.h    2010-04-15 23:36:41 +0000
+++ firewall/cache.h    2010-04-22 10:12:54 +0000
@@ -3,6 +3,7 @@
  *
  * Distributed under <a href="http://www.gnu.org/licenses/gpl2.txt";>GNU/GPL</a>
  */
+
 #ifndef HIP_FIREWALL_CACHE_H
 #define HIP_FIREWALL_CACHE_H
 
@@ -19,6 +20,4 @@
 
 void hip_firewall_cache_delete_hldb(int);
 
-
-
 #endif /* HIP_FIREWALL_CACHE_H */

=== modified file 'firewall/cache_port.h'
--- firewall/cache_port.h       2010-03-19 09:00:54 +0000
+++ firewall/cache_port.h       2010-04-22 10:12:54 +0000
@@ -3,6 +3,7 @@
  *
  * Distributed under <a href="http://www.gnu.org/licenses/gpl2.txt";>GNU/GPL</a>
  */
+
 #ifndef HIP_FIREWALL_CACHE_PORT_H
 #define HIP_FIREWALL_CACHE_PORT_H
 

=== modified file 'firewall/common_hipd_msg.h'
--- firewall/common_hipd_msg.h  2010-03-19 09:00:54 +0000
+++ firewall/common_hipd_msg.h  2010-04-22 10:12:54 +0000
@@ -3,6 +3,7 @@
  *
  * Distributed under <a href="http://www.gnu.org/licenses/gpl2.txt";>GNU/GPL</a>
  */
+
 #ifndef HIP_FIREWALL_COMMON_HIPD_MSG_H
 #define HIP_FIREWALL_COMMON_HIPD_MSG_H
 

=== modified file 'firewall/common_types.h'
--- firewall/common_types.h     2010-03-19 09:00:54 +0000
+++ firewall/common_types.h     2010-04-22 10:12:54 +0000
@@ -3,6 +3,7 @@
  *
  * Distributed under <a href="http://www.gnu.org/licenses/gpl2.txt";>GNU/GPL</a>
  */
+
 #ifndef HIP_FIREWALL_COMMON_TYPES_H
 #define HIP_FIREWALL_COMMON_TYPES_H
 

=== modified file 'firewall/conntrack.h'
--- firewall/conntrack.h        2010-04-22 10:05:56 +0000
+++ firewall/conntrack.h        2010-04-22 10:12:54 +0000
@@ -3,6 +3,7 @@
  *
  * Distributed under <a href="http://www.gnu.org/licenses/gpl2.txt";>GNU/GPL</a>
  */
+
 #ifndef HIP_FIREWALL_CONNTRACK_H
 #define HIP_FIREWALL_CONNTRACK_H
 

=== modified file 'firewall/datapkt.h'
--- firewall/datapkt.h  2010-03-19 09:00:54 +0000
+++ firewall/datapkt.h  2010-04-22 10:12:54 +0000
@@ -3,6 +3,7 @@
  *
  * Distributed under <a href="http://www.gnu.org/licenses/gpl2.txt";>GNU/GPL</a>
  */
+
 #ifndef HIP_FIREWALL_DATAPKT_H
 #define HIP_FIREWALL_DATAPKT_H
 

=== modified file 'firewall/dlist.h'
--- firewall/dlist.h    2010-03-19 09:00:54 +0000
+++ firewall/dlist.h    2010-04-22 10:12:54 +0000
@@ -3,6 +3,7 @@
  *
  * Distributed under <a href="http://www.gnu.org/licenses/gpl2.txt";>GNU/GPL</a>
  */
+
 #ifndef HIP_FIREWALL_DLIST_H
 #define HIP_FIREWALL_DLIST_H
 

=== modified file 'firewall/esp_prot_defines.h'
--- firewall/esp_prot_defines.h 2010-03-19 09:00:54 +0000
+++ firewall/esp_prot_defines.h 2010-04-22 10:12:54 +0000
@@ -3,6 +3,7 @@
  *
  * Distributed under <a href="http://www.gnu.org/licenses/gpl2.txt";>GNU/GPL</a>
  */
+
 #ifndef HIP_FIREWALL_ESP_PROT_DEFINES_H
 #define HIP_FIREWALL_ESP_PROT_DEFINES_H
 

=== modified file 'firewall/firewall.h'
--- firewall/firewall.h 2010-04-22 10:05:56 +0000
+++ firewall/firewall.h 2010-04-22 10:12:54 +0000
@@ -3,6 +3,7 @@
  *
  * Distributed under <a href="http://www.gnu.org/licenses/gpl2.txt";>GNU/GPL</a>
  */
+
 #ifndef HIP_FIREWALL_FIREWALL_H
 #define HIP_FIREWALL_FIREWALL_H
 

=== modified file 'firewall/firewall_control.h'
--- firewall/firewall_control.h 2010-03-19 09:00:54 +0000
+++ firewall/firewall_control.h 2010-04-22 10:12:54 +0000
@@ -3,6 +3,7 @@
  *
  * Distributed under <a href="http://www.gnu.org/licenses/gpl2.txt";>GNU/GPL</a>
  */
+
 #ifndef HIP_FIREWALL_FIREWALL_CONTROL_H
 #define HIP_FIREWALL_FIREWALL_CONTROL_H
 
@@ -12,4 +13,4 @@
 
 int hip_handle_msg(struct hip_common *msg);
 
-#endif /*HIP_FIREWALL_FIREWALL_CONTROL_H*/
+#endif /* HIP_FIREWALL_FIREWALL_CONTROL_H */

=== modified file 'firewall/firewall_defines.h'
--- firewall/firewall_defines.h 2010-04-21 14:47:24 +0000
+++ firewall/firewall_defines.h 2010-04-22 10:12:54 +0000
@@ -3,6 +3,7 @@
  *
  * Distributed under <a href="http://www.gnu.org/licenses/gpl2.txt";>GNU/GPL</a>
  */
+
 #ifndef HIP_FIREWALL_FIREWALL_DEFINES_H
 #define HIP_FIREWALL_FIREWALL_DEFINES_H
 
@@ -144,4 +145,4 @@
     struct hip_esp *esp_data;
 };
 
-#endif /*HIP_FIREWALL_FIREWALL_DEFINES_H*/
+#endif /* HIP_FIREWALL_FIREWALL_DEFINES_H */

=== modified file 'firewall/firewalldb.h'
--- firewall/firewalldb.h       2010-03-19 09:00:54 +0000
+++ firewall/firewalldb.h       2010-04-22 10:12:54 +0000
@@ -3,6 +3,7 @@
  *
  * Distributed under <a href="http://www.gnu.org/licenses/gpl2.txt";>GNU/GPL</a>
  */
+
 #ifndef HIP_FIREWALL_FIREWALLDB_H
 #define HIP_FIREWALL_FIREWALLDB_H
 

=== modified file 'firewall/helpers.h'
--- firewall/helpers.h  2010-04-22 10:05:56 +0000
+++ firewall/helpers.h  2010-04-22 10:12:54 +0000
@@ -3,6 +3,7 @@
  *
  * Distributed under <a href="http://www.gnu.org/licenses/gpl2.txt";>GNU/GPL</a>
  */
+
 #ifndef HIP_FIREWALL_HELPERS_H
 #define HIP_FIREWALL_HELPERS_H
 

=== modified file 'firewall/hslist.h'
--- firewall/hslist.h   2010-03-19 09:00:54 +0000
+++ firewall/hslist.h   2010-04-22 10:12:54 +0000
@@ -3,6 +3,7 @@
  *
  * Distributed under <a href="http://www.gnu.org/licenses/gpl2.txt";>GNU/GPL</a>
  */
+
 #ifndef HIP_FIREWALL_HSLIST_H
 #define HIP_FIREWALL_HSLIST_H
 
@@ -24,4 +25,4 @@
 
 SList *slist_last(SList *list);
 
-#endif /*HIP_FIREWALL_HSLIST_H*/
+#endif /* HIP_FIREWALL_HSLIST_H */

=== modified file 'firewall/lsi.h'
--- firewall/lsi.h      2010-04-22 10:05:56 +0000
+++ firewall/lsi.h      2010-04-22 10:12:54 +0000
@@ -3,6 +3,7 @@
  *
  * Distributed under <a href="http://www.gnu.org/licenses/gpl2.txt";>GNU/GPL</a>
  */
+
 #ifndef HIP_FIREWALL_LSI_H
 #define HIP_FIREWALL_LSI_H
 

=== modified file 'firewall/opptcp.h'
--- firewall/opptcp.h   2010-04-22 10:05:56 +0000
+++ firewall/opptcp.h   2010-04-22 10:12:54 +0000
@@ -3,6 +3,7 @@
  *
  * Distributed under <a href="http://www.gnu.org/licenses/gpl2.txt";>GNU/GPL</a>
  */
+
 #ifndef HIP_FIREWALL_OPPTCP_H
 #define HIP_FIREWALL_OPPTCP_H
 

=== modified file 'firewall/proxy.h'
--- firewall/proxy.h    2010-04-21 14:47:24 +0000
+++ firewall/proxy.h    2010-04-22 10:12:54 +0000
@@ -3,6 +3,7 @@
  *
  * Distributed under <a href="http://www.gnu.org/licenses/gpl2.txt";>GNU/GPL</a>
  */
+
 #ifndef HIP_FIREWALL_PROXY_H
 #define HIP_FIREWALL_PROXY_H
 

=== modified file 'firewall/proxyconndb.h'
--- firewall/proxyconndb.h      2010-04-15 23:33:52 +0000
+++ firewall/proxyconndb.h      2010-04-22 10:12:54 +0000
@@ -3,6 +3,7 @@
  *
  * Distributed under <a href="http://www.gnu.org/licenses/gpl2.txt";>GNU/GPL</a>
  */
+
 #ifndef HIP_FIREWALL_PROXYCONNDB_H
 #define HIP_FIREWALL_PROXYCONNDB_H
 

=== modified file 'firewall/proxydb.h'
--- firewall/proxydb.h  2010-04-15 23:33:52 +0000
+++ firewall/proxydb.h  2010-04-22 10:12:54 +0000
@@ -3,6 +3,7 @@
  *
  * Distributed under <a href="http://www.gnu.org/licenses/gpl2.txt";>GNU/GPL</a>
  */
+
 #ifndef HIP_FIREWALL_PROXYDB_H
 #define HIP_FIREWALL_PROXYDB_H
 
@@ -46,5 +47,4 @@
 
 void hip_uninit_proxy_db(void);
 
-
 #endif /* HIP_FIREWALL_PROXYDB_H */

=== modified file 'firewall/rule_management.h'
--- firewall/rule_management.h  2010-04-22 10:05:56 +0000
+++ firewall/rule_management.h  2010-04-22 10:12:54 +0000
@@ -3,6 +3,7 @@
  *
  * Distributed under <a href="http://www.gnu.org/licenses/gpl2.txt";>GNU/GPL</a>
  */
+
 #ifndef HIP_FIREWALL_RULE_MANAGEMENT_H
 #define HIP_FIREWALL_RULE_MANAGEMENT_H
 

=== modified file 'firewall/sysopp.h'
--- firewall/sysopp.h   2010-03-19 09:00:54 +0000
+++ firewall/sysopp.h   2010-04-22 10:12:54 +0000
@@ -3,6 +3,7 @@
  *
  * Distributed under <a href="http://www.gnu.org/licenses/gpl2.txt";>GNU/GPL</a>
  */
+
 #ifndef HIP_FIREWALL_SYSOPP_H
 #define HIP_FIREWALL_SYSOPP_H
 

=== modified file 'hipd/accessor.h'
--- hipd/accessor.h     2010-04-20 12:18:06 +0000
+++ hipd/accessor.h     2010-04-22 10:12:54 +0000
@@ -3,6 +3,7 @@
  *
  * Distributed under <a href="http://www.gnu.org/licenses/gpl2.txt";>GNU/GPL</a>
  */
+
 #ifndef HIP_HIPD_ACCESSOR_H
 #define HIP_HIPD_ACCESSOR_H
 

=== modified file 'hipd/blind.h'
--- hipd/blind.h        2010-04-22 10:10:34 +0000
+++ hipd/blind.h        2010-04-22 10:12:54 +0000
@@ -3,6 +3,7 @@
  *
  * Distributed under <a href="http://www.gnu.org/licenses/gpl2.txt";>GNU/GPL</a>
  */
+
 #ifndef HIP_HIPD_BLIND_H
 #define HIP_HIPD_BLIND_H
 

=== modified file 'hipd/bos.h'
--- hipd/bos.h  2010-03-19 08:47:02 +0000
+++ hipd/bos.h  2010-04-22 10:12:54 +0000
@@ -3,6 +3,7 @@
  *
  * Distributed under <a href="http://www.gnu.org/licenses/gpl2.txt";>GNU/GPL</a>
  */
+
 #ifndef HIP_HIPD_BOS_H
 #define HIP_HIPD_BOS_H
 
@@ -23,5 +24,4 @@
                    struct in6_addr *bos_daddr,
                    hip_ha_t *entry, hip_portpair_t *);
 
-
 #endif /* HIP_HIPD_BOS_H */

=== modified file 'hipd/cert.h'
--- hipd/cert.h 2010-04-15 15:45:33 +0000
+++ hipd/cert.h 2010-04-22 10:12:54 +0000
@@ -3,6 +3,7 @@
  *
  * Distributed under <a href="http://www.gnu.org/licenses/gpl2.txt";>GNU/GPL</a>
  */
+
 #ifndef HIP_HIPD_CERT_H
 #define HIP_HIPD_CERT_H
 

=== modified file 'hipd/close.h'
--- hipd/close.h        2010-03-19 08:47:02 +0000
+++ hipd/close.h        2010-04-22 10:12:54 +0000
@@ -3,6 +3,7 @@
  *
  * Distributed under <a href="http://www.gnu.org/licenses/gpl2.txt";>GNU/GPL</a>
  */
+
 #ifndef HIP_HIPD_CLOSE_H
 #define HIP_HIPD_CLOSE_H
 

=== modified file 'hipd/configfilereader.h'
--- hipd/configfilereader.h     2010-03-10 17:44:36 +0000
+++ hipd/configfilereader.h     2010-04-22 10:12:54 +0000
@@ -55,6 +55,7 @@
  * @date    14.02.2008
  * @note    Distributed under <a 
href="http://www.gnu.org/licenses/gpl2.txt";>GNU/GPL</a>.
  */
+
 #ifndef HIP_HIPD_CONFIGFILEREADER_H
 #define HIP_HIPD_CONFIGFILEREADER_H
 

=== modified file 'hipd/cookie.h'
--- hipd/cookie.h       2010-03-19 08:47:02 +0000
+++ hipd/cookie.h       2010-04-22 10:12:54 +0000
@@ -3,6 +3,7 @@
  *
  * Distributed under <a href="http://www.gnu.org/licenses/gpl2.txt";>GNU/GPL</a>
  */
+
 #ifndef HIP_HIPD_COOKIE_H
 #define HIP_HIPD_COOKIE_H
 
@@ -41,4 +42,5 @@
 int hip_dec_cookie_difficulty(hip_hit_t *not_used);
 int hip_get_puzzle_difficulty_msg(struct hip_common *msg);
 int hip_set_puzzle_difficulty_msg(struct hip_common *msg);
+
 #endif /* HIP_HIPD_COOKIE_H */

=== modified file 'hipd/dh.h'
--- hipd/dh.h   2010-03-19 08:47:02 +0000
+++ hipd/dh.h   2010-04-22 10:12:54 +0000
@@ -3,6 +3,7 @@
  *
  * Distributed under <a href="http://www.gnu.org/licenses/gpl2.txt";>GNU/GPL</a>
  */
+
 #ifndef HIP_HIPD_DH_H
 #define HIP_HIPD_DH_H
 
@@ -16,4 +17,5 @@
                                 signed int len,
                                 unsigned char *buffer,
                                 int bufsize);
+
 #endif /* HIP_HIPD_DH_H */

=== modified file 'hipd/dht.h'
--- hipd/dht.h  2010-03-19 09:00:54 +0000
+++ hipd/dht.h  2010-04-22 10:12:54 +0000
@@ -3,6 +3,7 @@
  *
  * Distributed under <a href="http://www.gnu.org/licenses/gpl2.txt";>GNU/GPL</a>
  */
+
 #ifndef HIP_HIPD_DHT_H
 #define HIP_HIPD_DHT_H
 

=== modified file 'hipd/hadb.h'
--- hipd/hadb.h 2010-04-20 12:15:57 +0000
+++ hipd/hadb.h 2010-04-22 10:12:54 +0000
@@ -3,6 +3,7 @@
  *
  * Distributed under <a href="http://www.gnu.org/licenses/gpl2.txt";>GNU/GPL</a>
  */
+
 #ifndef HIP_HIPD_HADB_H
 #define HIP_HIPD_HADB_H
 

=== modified file 'hipd/hadb_legacy.h'
--- hipd/hadb_legacy.h  2010-03-19 08:47:02 +0000
+++ hipd/hadb_legacy.h  2010-04-22 10:12:54 +0000
@@ -3,6 +3,7 @@
  *
  * Distributed under <a href="http://www.gnu.org/licenses/gpl2.txt";>GNU/GPL</a>
  */
+
 #ifndef HIP_HIPD_HADB_LEGACY_H
 #define HIP_HIPD_HADB_LEGACY_H
 

=== modified file 'hipd/heartbeat.h'
--- hipd/heartbeat.h    2010-03-19 09:00:54 +0000
+++ hipd/heartbeat.h    2010-04-22 10:12:54 +0000
@@ -3,6 +3,7 @@
  *
  * Distributed under <a href="http://www.gnu.org/licenses/gpl2.txt";>GNU/GPL</a>
  */
+
 #ifndef HIP_HIPD_HEARTBEAT_H
 #define HIP_HIPD_HEARTBEAT_H
 

=== modified file 'hipd/hi3.h'
--- hipd/hi3.h  2010-03-19 08:47:02 +0000
+++ hipd/hi3.h  2010-04-22 10:12:54 +0000
@@ -3,6 +3,7 @@
  *
  * Distributed under <a href="http://www.gnu.org/licenses/gpl2.txt";>GNU/GPL</a>
  */
+
 #ifndef HIP_HIPD_HI3_H
 #define HIP_HIPD_HI3_H
 

=== modified file 'hipd/hidb.h'
--- hipd/hidb.h 2010-04-21 15:18:19 +0000
+++ hipd/hidb.h 2010-04-22 10:12:54 +0000
@@ -3,6 +3,7 @@
  *
  * Distributed under <a href="http://www.gnu.org/licenses/gpl2.txt";>GNU/GPL</a>
  */
+
 #ifndef HIP_HIPD_HIDB
 #define HIP_HIPD_HIDB
 

=== modified file 'hipd/hipd.h'
--- hipd/hipd.h 2010-04-20 12:15:57 +0000
+++ hipd/hipd.h 2010-04-22 10:12:54 +0000
@@ -3,6 +3,7 @@
  *
  * Distributed under <a href="http://www.gnu.org/licenses/gpl2.txt";>GNU/GPL</a>
  */
+
 #ifndef HIP_HIPD_HIPD_H
 #define HIP_HIPD_HIPD_H
 

=== modified file 'hipd/hiprelay.h'
--- hipd/hiprelay.h     2010-04-20 11:21:03 +0000
+++ hipd/hiprelay.h     2010-04-22 10:12:54 +0000
@@ -9,6 +9,7 @@
  *          <a 
href="http://www.ietf.org/internet-drafts/draft-ietf-hip-nat-traversal-03.txt";>
  *          draft-ietf-hip-nat-traversal-03</a>
  */
+
 #ifndef HIP_HIPD_HIPRELAY_H
 #define HIP_HIPD_HIPRELAY_H
 

=== modified file 'hipd/init.h'
--- hipd/init.h 2010-04-13 11:10:38 +0000
+++ hipd/init.h 2010-04-22 10:12:54 +0000
@@ -3,6 +3,7 @@
  *
  * Distributed under <a href="http://www.gnu.org/licenses/gpl2.txt";>GNU/GPL</a>
  */
+
 #ifndef HIP_HIPD_INIT_H
 #define HIP_HIPD_INIT_H
 
@@ -52,4 +53,5 @@
 void hip_close(int signal);
 void hip_exit(int signal);
 int hip_init_dht(void);
+
 #endif /* HIP_HIPD_INIT_H */

=== modified file 'hipd/input.h'
--- hipd/input.h        2010-04-20 12:15:57 +0000
+++ hipd/input.h        2010-04-22 10:12:54 +0000
@@ -12,6 +12,7 @@
  * @author  Rene Hummen
  * @note    Distributed under <a 
href="http://www.gnu.org/licenses/gpl2.txt";>GNU/GPL</a>.
  */
+
 #ifndef HIP_HIPD_INPUT_H
 #define HIP_HIPD_INPUT_H
 

=== modified file 'hipd/keymat.h'
--- hipd/keymat.h       2010-03-19 08:47:02 +0000
+++ hipd/keymat.h       2010-04-22 10:12:54 +0000
@@ -3,6 +3,7 @@
  *
  * Distributed under <a href="http://www.gnu.org/licenses/gpl2.txt";>GNU/GPL</a>
  */
+
 #ifndef HIP_HIPD_KEYMAT_H
 #define HIP_HIPD_KEYMAT_H
 
@@ -23,4 +24,5 @@
 int hip_keymat_draw_and_copy(unsigned char *dst,
                              struct hip_keymat_keymat *keymat,
                              int len);
+
 #endif /* HIP_HIPD_KEYMAT_H */

=== modified file 'hipd/maintenance.h'
--- hipd/maintenance.h  2010-03-19 08:47:02 +0000
+++ hipd/maintenance.h  2010-04-22 10:12:54 +0000
@@ -3,6 +3,7 @@
  *
  * Distributed under <a href="http://www.gnu.org/licenses/gpl2.txt";>GNU/GPL</a>
  */
+
 #ifndef HIP_HIPD_MAINTENANCE_H
 #define HIP_HIPD_MAINTENANCE_H
 
@@ -42,4 +43,5 @@
                              struct in6_addr *hit_r,
                              struct in6_addr *src,
                              struct in6_addr *dst);
+
 #endif /* HIP_HIPD_MAINTENANCE_H */

=== modified file 'hipd/nat.h'
--- hipd/nat.h  2010-03-10 17:44:36 +0000
+++ hipd/nat.h  2010-04-22 10:12:54 +0000
@@ -15,6 +15,7 @@
  * @note    Distributed under <a 
href="http://www.gnu.org/licenses/gpl2.txt";>GNU/GPL</a>.
  * @note    All Doxygen comments have been added in version 1.1.
  */
+
 #ifndef HIP_HIPD_NAT_H
 #define HIP_HIPD_NAT_H
 
@@ -35,4 +36,5 @@
 hip_transform_suite_t hip_nat_set_control(hip_ha_t *entry, 
hip_transform_suite_t mode);
 int hip_user_nat_mode(int nat_mode);
 hip_transform_suite_t hip_nat_get_control(hip_ha_t *entry);
+
 #endif /* HIP_HIPD_NAT_H */

=== modified file 'hipd/netdev.h'
--- hipd/netdev.h       2010-04-08 11:05:16 +0000
+++ hipd/netdev.h       2010-04-22 10:12:54 +0000
@@ -7,6 +7,7 @@
  * The component provides interface to receive IP address and IF
  * events over netlink from the kernel.
  */
+
 #ifndef HIP_HIPD_NETDEV_H
 #define HIP_HIPD_NETDEV_H
 

=== modified file 'hipd/output.h'
--- hipd/output.h       2010-04-20 12:18:06 +0000
+++ hipd/output.h       2010-04-22 10:12:54 +0000
@@ -8,8 +8,10 @@
  * @author Rene Hummen
  * @note    Distributed under <a 
href="http://www.gnu.org/licenses/gpl2.txt";>GNU/GPL</a>.
  */
+
 #ifndef HIP_HIPD_OUTPUT_H
 #define HIP_HIPD_OUTPUT_H
+
 #include <netinet/ip6.h>
 #include <netinet/ip.h>
 #include <netinet/tcp.h>

=== modified file 'hipd/pfkeyapi.h'
--- hipd/pfkeyapi.h     2010-03-19 09:00:54 +0000
+++ hipd/pfkeyapi.h     2010-04-22 10:12:54 +0000
@@ -3,6 +3,7 @@
  *
  * Distributed under <a href="http://www.gnu.org/licenses/gpl2.txt";>GNU/GPL</a>
  */
+
 #ifndef HIP_HIPD_PFKEYAPI_H
 #define HIP_HIPD_PFKEYAPI_H
 

=== modified file 'hipd/pisa.h'
--- hipd/pisa.h 2010-03-18 21:15:21 +0000
+++ hipd/pisa.h 2010-04-22 10:12:54 +0000
@@ -10,6 +10,7 @@
  *
  * @author Thomas Jansen
  */
+
 #ifndef HIP_HIPD_PISA_H
 #define HIP_HIPD_PISA_H
 

=== modified file 'hipd/registration.h'
--- hipd/registration.h 2010-03-10 17:44:36 +0000
+++ hipd/registration.h 2010-04-22 10:12:54 +0000
@@ -11,6 +11,7 @@
  * @see     hiprelay.h
  * @see     escrow.h
  */
+
 #ifndef HIP_HIPD_REGISTRATION_H
 #define HIP_HIPD_REGISTRATION_H
 

=== modified file 'hipd/update.h'
--- hipd/update.h       2010-03-24 11:06:15 +0000
+++ hipd/update.h       2010-04-22 10:12:54 +0000
@@ -6,6 +6,7 @@
  * @date    3.5.2009
  * @note    Distributed under <a 
href="http://www.gnu.org/licenses/gpl2.txt";>GNU/GPL</a>.
  */
+
 #ifndef HIP_HIPD_UPDATE_H
 #define HIP_HIPD_UPDATE_H
 

=== modified file 'hipd/update_legacy.h'
--- hipd/update_legacy.h        2010-03-19 08:47:02 +0000
+++ hipd/update_legacy.h        2010-04-22 10:12:54 +0000
@@ -3,6 +3,7 @@
  *
  * Distributed under <a href="http://www.gnu.org/licenses/gpl2.txt";>GNU/GPL</a>
  */
+
 #ifndef HIP_HIPD_UPDATE_LEGACY_H
 #define HIP_HIPD_UPDATE_LEGACY_H
 

=== modified file 'hipd/user.h'
--- hipd/user.h 2010-03-18 17:12:09 +0000
+++ hipd/user.h 2010-04-22 10:12:54 +0000
@@ -8,6 +8,7 @@
  * @author  Rene Hummen
  * @note    Distributed under <a 
href="http://www.gnu.org/licenses/gpl2.txt";>GNU/GPL</a>.
  */
+
 #ifndef HIP_HIPD_USER_H
 #define HIP_HIPD_USER_H
 

=== modified file 'lib/conf/hipconf.h'
--- lib/conf/hipconf.h  2010-04-22 10:05:56 +0000
+++ lib/conf/hipconf.h  2010-04-22 10:12:54 +0000
@@ -12,6 +12,7 @@
  * @author  Tao Wan <twan@xxxxxxxxx>
  * @note    Distributed under <a 
href="http://www.gnu.org/licenses/gpl2.txt";>GNU/GPL</a>
  */
+
 #ifndef HIP_LIB_CONF_HIPCONF_H
 #define HIP_LIB_CONF_HIPCONF_H
 

=== modified file 'lib/core/builder.h'
--- lib/core/builder.h  2010-04-21 16:18:27 +0000
+++ lib/core/builder.h  2010-04-22 10:12:54 +0000
@@ -7,6 +7,7 @@
  * @version 1.0
  * @note    Distributed under <a 
href="http://www.gnu.org/licenses/gpl2.txt";>GNU/GPL</a>.
  */
+
 #ifndef HIP_LIB_CORE_BUILDER_H
 #define HIP_LIB_CORE_BUILDER_H
 

=== modified file 'lib/core/certtools.h'
--- lib/core/certtools.h        2010-03-19 09:00:54 +0000
+++ lib/core/certtools.h        2010-04-22 10:12:54 +0000
@@ -3,8 +3,6 @@
  *
  * Distributed under <a href="http://www.gnu.org/licenses/gpl2.txt";>GNU/GPL</a>
  */
-#ifndef HIP_LIB_CORE_CERTTOOLS_H
-#define HIP_LIB_CORE_CERTTOOLS_H
 
 /** @file
  * A header file for certtools.c
@@ -16,6 +14,10 @@
  * @date 31.3.2008
  *
  */
+
+#ifndef HIP_LIB_CORE_CERTTOOLS_H
+#define HIP_LIB_CORE_CERTTOOLS_H
+
 #include <sys/types.h>
 #include <sys/time.h>
 #include <time.h>

=== modified file 'lib/core/crypto.h'
--- lib/core/crypto.h   2010-04-21 16:38:28 +0000
+++ lib/core/crypto.h   2010-04-22 10:12:54 +0000
@@ -3,6 +3,7 @@
  *
  * Distributed under <a href="http://www.gnu.org/licenses/gpl2.txt";>GNU/GPL</a>
  */
+
 #ifndef HIP_LIB_CORE_CRYPTO_H
 #define HIP_LIB_CORE_CRYPTO_H
 

=== modified file 'lib/core/debug.h'
--- lib/core/debug.h    2010-04-14 18:51:38 +0000
+++ lib/core/debug.h    2010-04-22 10:12:54 +0000
@@ -3,6 +3,7 @@
  *
  * Distributed under <a href="http://www.gnu.org/licenses/gpl2.txt";>GNU/GPL</a>
  */
+
 #ifndef HIP_LIB_CORE_DEBUG_H
 #define HIP_LIB_CORE_DEBUG_H
 

=== modified file 'lib/core/filemanip.h'
--- lib/core/filemanip.h        2010-04-08 16:20:56 +0000
+++ lib/core/filemanip.h        2010-04-22 10:12:54 +0000
@@ -3,6 +3,7 @@
  *
  * Distributed under <a href="http://www.gnu.org/licenses/gpl2.txt";>GNU/GPL</a>
  */
+
 #ifndef HIP_LIB_CORE_FILEMANIP_H
 #define HIP_LIB_CORE_FILEMANIP_H
 

=== modified file 'lib/core/hip_capability.h'
--- lib/core/hip_capability.h   2010-02-17 17:38:08 +0000
+++ lib/core/hip_capability.h   2010-04-22 10:12:54 +0000
@@ -4,6 +4,7 @@
  * @author  Tobias Heer  <heer@xxxxxxxxxxxxxxxxx> (header file only)
  * @note    Distributed under <a 
href="http://www.gnu.org/licenses/gpl2.txt";>GNU/GPL</a>.
  */
+
 #ifndef HIP_LIB_CORE_HIP_CAPABILITY_H
 #define HIP_LIB_CORE_HIP_CAPABILITY_H
 

=== modified file 'lib/core/hip_statistics.h'
--- lib/core/hip_statistics.h   2010-03-18 21:15:21 +0000
+++ lib/core/hip_statistics.h   2010-04-22 10:12:54 +0000
@@ -6,6 +6,7 @@
  *
  * @author Rene Hummen
  */
+
 #ifndef HIP_LIB_CORE_HIP_STATISTICS_H
 #define HIP_LIB_CORE_HIP_STATISTICS_H
 

=== modified file 'lib/core/hip_udp.h'
--- lib/core/hip_udp.h  2010-04-13 10:59:42 +0000
+++ lib/core/hip_udp.h  2010-04-22 10:12:54 +0000
@@ -3,6 +3,7 @@
  *
  * Distributed under <a href="http://www.gnu.org/licenses/gpl2.txt";>GNU/GPL</a>
  */
+
 #ifndef HIP_LIB_CORE_HIP_UDP_H
 #define HIP_LIB_CORE_HIP_UDP_H
 

=== modified file 'lib/core/hit.h'
--- lib/core/hit.h      2010-03-19 09:00:54 +0000
+++ lib/core/hit.h      2010-04-22 10:12:54 +0000
@@ -3,6 +3,7 @@
  *
  * Distributed under <a href="http://www.gnu.org/licenses/gpl2.txt";>GNU/GPL</a>
  */
+
 #ifndef HIP_LIB_CORE_HIT_H
 #define HIP_LIB_CORE_HIT_H
 

=== modified file 'lib/core/hostid.h'
--- lib/core/hostid.h   2010-03-19 09:00:54 +0000
+++ lib/core/hostid.h   2010-04-22 10:12:54 +0000
@@ -3,6 +3,7 @@
  *
  * Distributed under <a href="http://www.gnu.org/licenses/gpl2.txt";>GNU/GPL</a>
  */
+
 #ifndef HIP_LIB_CORE_HOSTID_H
 #define HIP_LIB_CORE_HOSTID_H
 

=== modified file 'lib/core/hostsfiles.h'
--- lib/core/hostsfiles.h       2010-04-08 16:02:42 +0000
+++ lib/core/hostsfiles.h       2010-04-22 10:12:54 +0000
@@ -3,6 +3,7 @@
  *
  * Distributed under <a href="http://www.gnu.org/licenses/gpl2.txt";>GNU/GPL</a>
  */
+
 #ifndef HIP_LIB_CORE_HOSTSFILES_H
 #define HIP_LIB_CORE_HOSTSFILES_H
 

=== modified file 'lib/core/icomm.h'
--- lib/core/icomm.h    2010-04-14 18:51:38 +0000
+++ lib/core/icomm.h    2010-04-22 10:12:54 +0000
@@ -3,6 +3,7 @@
  *
  * Distributed under <a href="http://www.gnu.org/licenses/gpl2.txt";>GNU/GPL</a>
  */
+
 #ifndef HIP_LIB_CORE_ICOMM_H
 #define HIP_LIB_CORE_ICOMM_H
 

=== modified file 'lib/core/ife.h'
--- lib/core/ife.h      2010-03-19 08:47:02 +0000
+++ lib/core/ife.h      2010-04-22 10:12:54 +0000
@@ -3,6 +3,7 @@
  *
  * Distributed under <a href="http://www.gnu.org/licenses/gpl2.txt";>GNU/GPL</a>
  */
+
 #ifndef HIP_LIB_CORE_IFE_H
 #define HIP_LIB_CORE_IFE_H
 

=== modified file 'lib/core/keylen.h'
--- lib/core/keylen.h   2010-03-19 09:00:54 +0000
+++ lib/core/keylen.h   2010-04-22 10:12:54 +0000
@@ -3,6 +3,7 @@
  *
  * Distributed under <a href="http://www.gnu.org/licenses/gpl2.txt";>GNU/GPL</a>
  */
+
 #ifndef HIP_LIB_CORE_KEYLEN_H
 #define HIP_LIB_CORE_KEYLEN_H
 

=== modified file 'lib/core/linkedlist.h'
--- lib/core/linkedlist.h       2010-02-26 13:20:07 +0000
+++ lib/core/linkedlist.h       2010-04-22 10:12:54 +0000
@@ -18,6 +18,7 @@
  * @date    21.04.2008
  * @note    Distributed under <a 
href="http://www.gnu.org/licenses/gpl2.txt";>GNU/GPL</a>.
  */
+
 #ifndef HIP_LIB_CORE_LINKEDLIST_H
 #define HIP_LIB_CORE_LINKEDLIST_H
 

=== modified file 'lib/core/list.h'
--- lib/core/list.h     2010-04-21 15:39:34 +0000
+++ lib/core/list.h     2010-04-22 10:12:54 +0000
@@ -3,6 +3,7 @@
  *
  * Distributed under <a href="http://www.gnu.org/licenses/gpl2.txt";>GNU/GPL</a>
  */
+
 #ifndef HIP_LIB_CORE_LIST_H
 #define HIP_LIB_CORE_LIST_H
 

=== modified file 'lib/core/message.h'
--- lib/core/message.h  2010-04-13 10:59:42 +0000
+++ lib/core/message.h  2010-04-22 10:12:54 +0000
@@ -6,6 +6,7 @@
  * @version 1.0
  * @note    Distributed under <a 
href="http://www.gnu.org/licenses/gpl2.txt";>GNU/GPL</a>.
  */
+
 #ifndef HIP_LIB_CORE_MESSAGE_H
 #define HIP_LIB_CORE_MESSAGE_H
 

=== modified file 'lib/core/performance.h'
--- lib/core/performance.h      2010-04-22 10:10:34 +0000
+++ lib/core/performance.h      2010-04-22 10:12:54 +0000
@@ -3,6 +3,7 @@
  *
  * Distributed under <a href="http://www.gnu.org/licenses/gpl2.txt";>GNU/GPL</a>
  */
+
 #ifndef HIP_LIB_PERFORMANCE_PERFORMANCE_H
 #define HIP_LIB_PERFORMANCE_PERFORMANCE_H
 

=== modified file 'lib/core/protodefs.h'
--- lib/core/protodefs.h        2010-04-16 01:36:19 +0000
+++ lib/core/protodefs.h        2010-04-22 10:12:54 +0000
@@ -7,6 +7,7 @@
  * This file defines a Host Identity Protocol (HIP) header and parameter
  * related constants and structures.
  */
+
 #ifndef HIP_LIB_CORE_PROTODEFS_H
 #define HIP_LIB_CORE_PROTODEFS_H
 

=== modified file 'lib/core/solve.h'
--- lib/core/solve.h    2010-03-19 09:00:54 +0000
+++ lib/core/solve.h    2010-04-22 10:12:54 +0000
@@ -3,6 +3,7 @@
  *
  * Distributed under <a href="http://www.gnu.org/licenses/gpl2.txt";>GNU/GPL</a>
  */
+
 #ifndef HIP_LIB_CORE_SOLVE_H
 #define HIP_LIB_CORE_SOLVE_H
 

=== modified file 'lib/core/sqlitedbapi.h'
--- lib/core/sqlitedbapi.h      2010-03-19 09:00:54 +0000
+++ lib/core/sqlitedbapi.h      2010-04-22 10:12:54 +0000
@@ -3,6 +3,7 @@
  *
  * Distributed under <a href="http://www.gnu.org/licenses/gpl2.txt";>GNU/GPL</a>
  */
+
 #ifndef HIP_LIB_CORE_SQLITEDBAPI_H
 #define HIP_LIB_CORE_SQLITEDBAPI_H
 
@@ -75,4 +76,5 @@
 int hip_sqlite_delete_from_table(sqlite3 *, const char *);
 int hip_sqlite_insert_into_table(sqlite3 *, const char *);
 int hip_sqlite_create_table(sqlite3 *, const char *);
+
 #endif /* HIP_LIB_CORE_SQLITEDBAPI_H */

=== modified file 'lib/core/state.h'
--- lib/core/state.h    2010-04-21 21:50:48 +0000
+++ lib/core/state.h    2010-04-22 10:12:54 +0000
@@ -4,6 +4,7 @@
  *
  * @note Distributed under <a 
href="http://www.gnu.org/licenses/gpl2.txt";>GNU/GPL</a>.
  */
+
 #ifndef HIP_LIB_CORE_STATE_H
 #define HIP_LIB_CORE_STATE_H
 

=== modified file 'lib/core/straddr.h'
--- lib/core/straddr.h  2010-03-19 09:00:54 +0000
+++ lib/core/straddr.h  2010-04-22 10:12:54 +0000
@@ -3,6 +3,7 @@
  *
  * Distributed under <a href="http://www.gnu.org/licenses/gpl2.txt";>GNU/GPL</a>
  */
+
 #ifndef HIP_LIB_CORE_STRADDR_H
 #define HIP_LIB_CORE_STRADDR_H
 

=== modified file 'lib/core/transform.h'
--- lib/core/transform.h        2010-03-19 09:00:54 +0000
+++ lib/core/transform.h        2010-04-22 10:12:54 +0000
@@ -3,6 +3,7 @@
  *
  * Distributed under <a href="http://www.gnu.org/licenses/gpl2.txt";>GNU/GPL</a>
  */
+
 #ifndef HIP_LIB_CORE_TRANSFORM_H
 #define HIP_LIB_CORE_TRANSFORM_H
 

=== modified file 'lib/dht/libhipdht.h'
--- lib/dht/libhipdht.h 2010-03-19 09:00:54 +0000
+++ lib/dht/libhipdht.h 2010-04-22 10:12:54 +0000
@@ -72,4 +72,5 @@
                     struct in6_addr *rhit,
                     void *final_key);
 int verify_hddr_lib(struct hip_common *hipcommonmsg, struct in6_addr *addrkey);
+
 #endif /* HIP_LIB_DHT_LIBHIPDHT_H */

=== modified file 'lib/dht/libhipdhtxml.h'
--- lib/dht/libhipdhtxml.h      2010-03-19 09:00:54 +0000
+++ lib/dht/libhipdhtxml.h      2010-04-22 10:12:54 +0000
@@ -1,6 +1,3 @@
-#ifndef HIP_LIB_DHT_LIBHIPDHTXML_H
-#define HIP_LIB_DHT_LIBHIPDHTXML_H
-
 /** @file
  * A header file for libhipopendhtxml.c
  *
@@ -14,6 +11,9 @@
  *
  */
 
+#ifndef HIP_LIB_DHT_LIBHIPDHTXML_H
+#define HIP_LIB_DHT_LIBHIPDHTXML_H
+
 /* All XML RPC packet creation and reading functions */
 
 int build_packet_put_rm(unsigned char *, int, unsigned char *,

=== modified file 'lib/gui/dragndrop.h'
--- lib/gui/dragndrop.h 2010-02-17 17:38:08 +0000
+++ lib/gui/dragndrop.h 2010-04-22 10:12:54 +0000
@@ -1,11 +1,13 @@
-#ifndef HIP_LIB_GUI_DRAGNDROP_H
-#define HIP_LIB_GUI_DRAGNDROP_H
 /*
  * HIPL GTK GUI
  *
  * License: GNU/GPL
  * Authors: Antti Partanen <aehparta@xxxxxxxxx>
  */
+
+#ifndef HIP_LIB_GUI_DRAGNDROP_H
+#define HIP_LIB_GUI_DRAGNDROP_H
+
 #include <gtk/gtk.h>
 
 void dnd_drag_begin(GtkWidget *widget, GdkDragContext *dc, gpointer data);
@@ -38,4 +40,5 @@
                             guint info,
                             guint t,
                             gpointer data);
+
 #endif /* HIP_LIB_GUI_DRAGNDROP_H */

=== modified file 'lib/gui/events.h'
--- lib/gui/events.h    2010-02-17 17:38:08 +0000
+++ lib/gui/events.h    2010-04-22 10:12:54 +0000
@@ -1,5 +1,3 @@
-#ifndef HIP_LIB_GUI_EVENTS_H
-#define HIP_LIB_GUI_EVENTS_H
 /*
  * HIPL GTK GUI
  *
@@ -7,6 +5,9 @@
  * Authors: Antti Partanen <aehparta@xxxxxxxxx>
  */
 
+#ifndef HIP_LIB_GUI_EVENTS_H
+#define HIP_LIB_GUI_EVENTS_H
+
 #include <gtk/gtk.h>
 
 enum BUTTON_IDS {

=== modified file 'lib/gui/hipgui.h'
--- lib/gui/hipgui.h    2010-04-14 18:51:38 +0000
+++ lib/gui/hipgui.h    2010-04-22 10:12:54 +0000
@@ -1,5 +1,3 @@
-#ifndef HIP_LIB_GUI_HIPGUI_H
-#define HIP_LIB_GUI_HIPGUI_H
 /*
  * HIPL GTK GUI
  *
@@ -7,6 +5,9 @@
  * Authors: Antti Partanen <aehparta@xxxxxxxxx>
  */
 
+#ifndef HIP_LIB_GUI_HIPGUI_H
+#define HIP_LIB_GUI_HIPGUI_H
+
 #include "agent/hitdb.h"
 
 /** @defgroup libhipgui HIP GUI library
@@ -35,5 +36,4 @@
 void gui_hiu_count(int);
 /* @} */
 
-
 #endif /* HIP_LIB_GUI_HIPGUI_H */

=== modified file 'lib/gui/tools.h'
--- lib/gui/tools.h     2010-02-17 17:38:08 +0000
+++ lib/gui/tools.h     2010-04-22 10:12:54 +0000
@@ -1,5 +1,3 @@
-#ifndef HIP_LIB_GUI_TOOLS_H
-#define HIP_LIB_GUI_TOOLS_H
 /*
  * HIPL GTK GUI
  *
@@ -7,6 +5,9 @@
  * Authors: Antti Partanen <aehparta@xxxxxxxxx>
  */
 
+#ifndef HIP_LIB_GUI_TOOLS_H
+#define HIP_LIB_GUI_TOOLS_H
+
 #include <gtk/gtk.h>
 
 #include "agent/hitdb.h"

=== modified file 'lib/gui/widgets.h'
--- lib/gui/widgets.h   2010-02-17 17:38:08 +0000
+++ lib/gui/widgets.h   2010-04-22 10:12:54 +0000
@@ -1,5 +1,3 @@
-#ifndef HIP_LIB_GUI_WIDGETS_H
-#define HIP_LIB_GUI_WIDGETS_H
 /*
  *  HIP Agent
  *
@@ -7,6 +5,9 @@
  *  Authors: Antti Partanen <aehparta@xxxxxxxxx>
  */
 
+#ifndef HIP_LIB_GUI_WIDGETS_H
+#define HIP_LIB_GUI_WIDGETS_H
+
 /*!
  *      \addtogroup libhipgui
  *      @{

=== modified file 'lib/opphip/wrap_db.h'
--- lib/opphip/wrap_db.h        2010-04-22 10:05:56 +0000
+++ lib/opphip/wrap_db.h        2010-04-22 10:12:54 +0000
@@ -3,6 +3,7 @@
  *
  * Distributed under <a href="http://www.gnu.org/licenses/gpl2.txt";>GNU/GPL</a>
  */
+
 #ifndef HIP_LIB_OPPHIP_WRAP_DB_H
 #define HIP_LIB_OPPHIP_WRAP_DB_H
 

=== modified file 'lib/tool/lutil.h'
--- lib/tool/lutil.h    2010-03-10 17:44:36 +0000
+++ lib/tool/lutil.h    2010-04-22 10:12:54 +0000
@@ -4,6 +4,7 @@
  * Distributed under
  * <a href="http://www.gnu.org/licenses/gpl2.txt";>GNU/GPL</a>
  */
+
 #ifndef HIP_LIB_TOOL_LUTIL_H
 #define HIP_LIB_TOOL_LUTIL_H
 

=== modified file 'lib/tool/xfrmapi.h'
--- lib/tool/xfrmapi.h  2010-03-10 17:44:36 +0000
+++ lib/tool/xfrmapi.h  2010-04-22 10:12:54 +0000
@@ -3,6 +3,7 @@
  * management of IPsec SAs and BEET API is for management of
  * HIT<->SPI,IP mappings.
  */
+
 #ifndef HIP_LIB_TOOL_XFRMAPI_H
 #define HIP_LIB_TOOL_XFRMAPI_H
 
@@ -81,5 +82,4 @@
 void hip_delete_default_prefix_sp_pair(void);
 int hip_setup_default_sp_prefix_pair(void);
 
-
 #endif /* HIP_LIB_TOOL_XFRMAPI_H */

=== modified file 'test/conntest.h'
--- test/conntest.h     2010-04-20 15:20:07 +0000
+++ test/conntest.h     2010-04-22 10:12:54 +0000
@@ -3,6 +3,7 @@
  *
  * Distributed under <a href="http://www.gnu.org/licenses/gpl2.txt";>GNU/GPL</a>
  */
+
 #ifndef HIP_TEST_CONNTEST_H
 #define HIP_TEST_CONNTEST_H

Other related posts:

  • » [hipl-commit] [trunk] Rev 4405: cosmetics: Consistently format all multiple inclusion guards in headers. - Diego Biurrun