[hipl-commit] [trunk] Rev 4362: Remove unnecessary #ifdefs around function declarations in headers.

  • From: Diego Biurrun <diego@xxxxxxxxxx>
  • To: hipl-commit@xxxxxxxxxxxxx
  • Date: Tue, 20 Apr 2010 15:18:23 +0300

Committer: Diego Biurrun <diego@xxxxxxxxxx>
Date: 20/04/2010 at 15:18:23
Revision: 4362
Revision-id: diego@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
Branch nick: trunk

Log:
  Remove unnecessary #ifdefs around function declarations in headers.

Modified:
  M  firewall/proxy.h
  M  hipd/accessor.h
  M  hipd/output.h
  M  lib/core/builder.h

=== modified file 'firewall/proxy.h'
--- firewall/proxy.h    2010-04-13 16:39:45 +0000
+++ firewall/proxy.h    2010-04-20 12:18:06 +0000
@@ -12,9 +12,7 @@
 #include "proxydb.h"
 #include "config.h"
 
-#ifdef CONFIG_HIP_HIPPROXY
 int request_hipproxy_status(void);
-#endif
 
 int init_proxy(void);
 int uninit_proxy(void);

=== modified file 'hipd/accessor.h'
--- hipd/accessor.h     2010-04-14 18:51:38 +0000
+++ hipd/accessor.h     2010-04-20 12:18:06 +0000
@@ -46,21 +46,16 @@
 void hipd_set_flag(unsigned int);
 int hip_agent_is_alive(void);
 
-#ifdef CONFIG_HIP_OPPORTUNISTIC
 int hip_get_opportunistic_tcp_status(void);
 int hip_set_opportunistic_mode(struct hip_common *msg);
 int hip_query_opportunistic_mode(struct hip_common *msg);
 int hip_query_ip_hit_mapping(struct hip_common *msg);
-#endif /* CONFIG_HIP_OPPORTUNISTIC */
 
-#ifdef CONFIG_HIP_I3
 int hip_get_hi3_status(void);
 void hip_set_hi3_status(struct hip_common *msg);
-#endif /* CONFIG_HIP_I3 */
 
 int hip_get_hip_proxy_status(void);
 int hip_set_hip_proxy_on(void);
 int hip_set_hip_proxy_off(void);
 
-
 #endif /* HIP_HIPD_ACCESSOR_H */

=== modified file 'hipd/output.h'
--- hipd/output.h       2010-04-10 09:12:33 +0000
+++ hipd/output.h       2010-04-20 12:18:06 +0000
@@ -91,9 +91,8 @@
                       in_port_t src_port, in_port_t dst_port,
                       const void *msg, int length);
 
-#ifdef CONFIG_HIP_I3
-int hip_send_i3(const struct in6_addr *, const struct in6_addr *, const 
in_port_t, const in_port_t,
+int hip_send_i3(const struct in6_addr *, const struct in6_addr *,
+                const in_port_t, const in_port_t,
                 struct hip_common *, hip_ha_t *, int);
-#endif /* CONFIG_HIP_I3 */
 
 #endif /* HIP_HIPD_OUTPUT_H */

=== modified file 'lib/core/builder.h'
--- lib/core/builder.h  2010-04-15 20:47:19 +0000
+++ lib/core/builder.h  2010-04-20 12:18:06 +0000
@@ -114,13 +114,13 @@
                            uint8_t,
                            uint32_t,
                            uint64_t);
-#ifdef CONFIG_HIP_MIDAUTH
+
 int hip_build_param_challenge_request(struct hip_common *,
                                       uint8_t,
                                       uint8_t,
                                       uint8_t *,
                                       uint8_t);
-#endif
+
 int hip_build_param_r1_counter(struct hip_common *, uint64_t);
 
 int hip_build_param_seq(struct hip_common *, uint32_t);
@@ -136,11 +136,11 @@
         hip_build_param_solution(struct hip_common *,
                                  struct hip_puzzle *,
                                  uint64_t);
-#ifdef CONFIG_HIP_MIDAUTH
+
 int hip_build_param_challenge_response(struct hip_common *,
                                        struct hip_challenge_request *,
                                        uint64_t);
-#endif
+
 int hip_build_param(struct hip_common *, const void *);
 void hip_set_msg_response(struct hip_common *msg, uint8_t on);
 uint8_t hip_get_msg_response(struct hip_common *msg);

Other related posts:

  • » [hipl-commit] [trunk] Rev 4362: Remove unnecessary #ifdefs around function declarations in headers. - Diego Biurrun