[hipl-commit] [trunk] Rev 4079: Add missing headers to fix 'make checkheaders'.

  • From: Diego Biurrun <diego@xxxxxxxxxx>
  • To: hipl-commit@xxxxxxxxxxxxx
  • Date: Mon, 29 Mar 2010 22:28:55 +0300

Committer: Diego Biurrun <diego@xxxxxxxxxx>
Date: 29/03/2010 at 22:28:54
Revision: 4079
Revision-id: diego@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
Branch nick: trunk

Log:
  Add missing headers to fix 'make checkheaders'.

Modified:
  M  i3/chord/eprintf.h
  M  i3/i3/i3_addr.h
  M  i3/i3/i3_header.h
  M  i3/i3/i3_options.h
  M  i3/i3/i3_stack.h
  M  i3/i3/i3_trigger.h
  M  i3/i3/token_bucket.h
  M  i3/i3_client/i3_client_callback.h
  M  i3/i3_client/i3_client_fd.h
  M  i3/i3_client/i3_client_id.h
  M  i3/i3_client/i3_client_pkt.h
  M  i3/i3_client/i3_client_timer.h
  M  i3/i3_client/i3_client_trigger.h
  M  i3/utils/inetfns.h
  M  lib/android/icmp6.h
  M  lib/android/regex.h
  M  lib/ipsec/ipsec_strerror.h
  M  lib/ipsec/libpfkey.h
  M  lib/ipsec/policy_parse.h
  M  lib/opphip/wrap_db.h
  M  lib/tool/checksum.h
  M  lib/tool/pfkeysadb.h

=== modified file 'i3/chord/eprintf.h'
--- i3/chord/eprintf.h  2010-02-17 17:38:08 +0000
+++ i3/chord/eprintf.h  2010-03-29 19:28:37 +0000
@@ -2,6 +2,8 @@
 /* Excerpted from 'The Practice of Programming' */
 /* by Brian W. Kernighan and Rob Pike */
 
+#include <sys/types.h>
+
 /* eprintf.h: error wrapper functions */
 extern void    eprintf(char *, ...);
 extern void    weprintf(char *, ...);

=== modified file 'i3/i3/i3_addr.h'
--- i3/i3/i3_addr.h     2010-03-29 17:12:18 +0000
+++ i3/i3/i3_addr.h     2010-03-29 19:28:37 +0000
@@ -10,6 +10,7 @@
 #define I3_ADDR_H
 
 #include <stdint.h>
+#include "i3.h"
 
 /* functions implemented in i3_addr.c */
 i3_addr *alloc_i3_addr(void);

=== modified file 'i3/i3/i3_header.h'
--- i3/i3/i3_header.h   2010-02-17 17:38:08 +0000
+++ i3/i3/i3_header.h   2010-03-29 19:28:37 +0000
@@ -9,6 +9,7 @@
 #ifndef I3_HEADER_H
 #define I3_HEADER_H
 
+#include "i3.h"
 
 /* functions implemented in i3_header.c */
 i3_header *alloc_i3_header(void);

=== modified file 'i3/i3/i3_options.h'
--- i3/i3/i3_options.h  2010-02-17 17:38:08 +0000
+++ i3/i3/i3_options.h  2010-03-29 19:28:37 +0000
@@ -9,6 +9,8 @@
 #ifndef I3_OPTIONS_H
 #define I3_OPTIONS_H
 
+#include "i3.h"
+
 /* functions implemented in i3_options.c */
 i3_option *alloc_i3_option(void);
 void init_i3_option(i3_option *option, char type, void *entry);

=== modified file 'i3/i3/i3_stack.h'
--- i3/i3/i3_stack.h    2010-02-17 17:38:08 +0000
+++ i3/i3/i3_stack.h    2010-03-29 19:28:37 +0000
@@ -9,6 +9,8 @@
 #ifndef I3_STACK_H
 #define I3_STACK_H
 
+#include "i3.h"
+
 /* functions implemented in i3_stack.c */
 i3_stack *alloc_i3_stack(void);
 void init_i3_stack(i3_stack *s, ID *ids, int len);

=== modified file 'i3/i3/i3_trigger.h'
--- i3/i3/i3_trigger.h  2010-03-29 17:12:18 +0000
+++ i3/i3/i3_trigger.h  2010-03-29 19:28:37 +0000
@@ -10,6 +10,7 @@
 #define I3_TRIGGER_H
 
 #include <stdint.h>
+#include "i3.h"
 
 /* functions implemented in i3_trigger.c */
 i3_trigger *alloc_i3_trigger(void);

=== modified file 'i3/i3/token_bucket.h'
--- i3/i3/token_bucket.h        2010-03-29 17:12:18 +0000
+++ i3/i3/token_bucket.h        2010-03-29 19:28:37 +0000
@@ -10,6 +10,7 @@
 #define TOKEN_BUCKET_H
 
 #include <stdint.h>
+#include "i3.h"
 
 /* functions implemented in token_bucket.c */
 token_bucket *alloc_token_bucket(void);

=== modified file 'i3/i3_client/i3_client_callback.h'
--- i3/i3_client/i3_client_callback.h   2010-03-29 17:12:18 +0000
+++ i3/i3_client/i3_client_callback.h   2010-03-29 19:28:37 +0000
@@ -9,6 +9,7 @@
 #define I3_CLIENT_CALLBACK_H
 
 #include <stdint.h>
+#include "i3_client.h"
 
 int cl_register_context_callback(
     cl_context * ctx, uint16_t cbk_type,

=== modified file 'i3/i3_client/i3_client_fd.h'
--- i3/i3_client/i3_client_fd.h 2010-02-17 17:38:08 +0000
+++ i3/i3_client/i3_client_fd.h 2010-03-29 19:28:37 +0000
@@ -8,6 +8,7 @@
 #ifndef I3_CLIENT_FD_H
 #define I3_CLIENT_FD_H
 
+#include <sys/select.h>
 #include <sys/types.h>
 
 typedef struct fd_ {

=== modified file 'i3/i3_client/i3_client_id.h'
--- i3/i3_client/i3_client_id.h 2010-03-29 17:15:00 +0000
+++ i3/i3_client/i3_client_id.h 2010-03-29 19:28:37 +0000
@@ -9,6 +9,7 @@
 #define I3_CLIENT_ID_H
 
 #include <stdint.h>
+#include "i3_client.h"
 
 /* functions implemented in i3_client_id.c */
 cl_id *cl_alloc_id(void);

=== modified file 'i3/i3_client/i3_client_pkt.h'
--- i3/i3_client/i3_client_pkt.h        2010-03-29 17:12:18 +0000
+++ i3/i3_client/i3_client_pkt.h        2010-03-29 19:28:37 +0000
@@ -9,6 +9,7 @@
 #define I3_CLIENT_PKT_H
 
 #include <stdint.h>
+#include "i3_client.h"
 
 /* functions implemented in i3_client_pkt.c */
 int cl_send_data_packet(cl_context *ctx, i3_stack *stack,

=== modified file 'i3/i3_client/i3_client_timer.h'
--- i3/i3_client/i3_client_timer.h      2010-03-29 17:12:18 +0000
+++ i3/i3_client/i3_client_timer.h      2010-03-29 19:28:37 +0000
@@ -9,6 +9,7 @@
 #define I3_CLIENT_TIMER_H
 
 #include <stdint.h>
+#include "i3_client.h"
 
 /* functions implemented in i3_client_timer.c */
 void init_timer_heap(cl_context *ctx);

=== modified file 'i3/i3_client/i3_client_trigger.h'
--- i3/i3_client/i3_client_trigger.h    2010-03-29 17:12:18 +0000
+++ i3/i3_client/i3_client_trigger.h    2010-03-29 19:28:37 +0000
@@ -9,6 +9,7 @@
 #define I3_CLIENT_TRIGGER_H
 
 #include <stdint.h>
+#include "i3_client.h"
 
 /* functions implemented in i3_client_trigger.c */
 int cl_insert_trigger_into_i3(cl_context *ctx, cl_trigger *ctr);

=== modified file 'i3/utils/inetfns.h'
--- i3/utils/inetfns.h  2010-03-29 16:47:25 +0000
+++ i3/utils/inetfns.h  2010-03-29 19:28:37 +0000
@@ -1,6 +1,8 @@
 #ifndef _INET_FNS_H
 #define _INET_FNS_H
 
+#include <stdint.h>
+
 /* Get address of local machine */
 uint32_t get_local_addr_eth(void);
 uint32_t name_to_addr(const char *);

=== modified file 'lib/android/icmp6.h'
--- lib/android/icmp6.h 2010-02-18 14:58:39 +0000
+++ lib/android/icmp6.h 2010-03-29 19:28:37 +0000
@@ -65,6 +65,11 @@
 #ifndef _NETINET_ICMP6_H_
 #define _NETINET_ICMP6_H_
 
+#define _BSD_SOURCE
+
+#include <sys/types.h>
+#include <netinet/in.h>
+
 #define ICMPV6_PLD_MAXLEN       1232    /* IPV6_MMTU - sizeof(struct ip6_hdr)
                                            - sizeof(struct icmp6_hdr) */
 

=== modified file 'lib/android/regex.h'
--- lib/android/regex.h 2010-02-18 14:58:39 +0000
+++ lib/android/regex.h 2010-03-29 19:28:37 +0000
@@ -27,6 +27,8 @@
 /* VMS doesn't have `size_t' in <sys/types.h>, even though POSIX says it
    should be there.  */
 #include <stddef.h>
+#else
+#include <sys/types.h>
 #endif
 
 

=== modified file 'lib/ipsec/ipsec_strerror.h'
--- lib/ipsec/ipsec_strerror.h  2010-02-17 17:38:08 +0000
+++ lib/ipsec/ipsec_strerror.h  2010-03-29 19:28:37 +0000
@@ -34,6 +34,8 @@
 #ifndef IPSEC_STRERROR_H
 #define IPSEC_STRERROR_H
 
+#include <sys/cdefs.h>
+
 extern int __ipsec_errcode;
 extern void __ipsec_set_strerror __P((const char *));
 

=== modified file 'lib/ipsec/libpfkey.h'
--- lib/ipsec/libpfkey.h        2010-02-17 17:38:08 +0000
+++ lib/ipsec/libpfkey.h        2010-03-29 19:28:37 +0000
@@ -37,6 +37,12 @@
 #ifndef KAME_LIBPFKEY_H
 #define KAME_LIBPFKEY_H
 
+#define _BSD_SOURCE
+
+#include <sys/cdefs.h>
+#include <sys/types.h>
+#include <linux/ipsec.h>
+
 #define PRIORITY_LOW        0xC0000000
 #define PRIORITY_DEFAULT    0x80000000
 #define PRIORITY_HIGH       0x40000000
@@ -52,10 +58,6 @@
 struct sockaddr;
 struct sadb_alg;
 
-/* Accomodate different prototypes in <netinet6/ipsec.h> */
-#include <sys/types.h>
-#include <linux/ipsec.h>
-
 #ifndef HAVE_IPSEC_POLICY_T
 typedef caddr_t ipsec_policy_t;
 #define __ipsec_const

=== modified file 'lib/ipsec/policy_parse.h'
--- lib/ipsec/policy_parse.h    2010-02-17 17:38:08 +0000
+++ lib/ipsec/policy_parse.h    2010-03-29 19:28:37 +0000
@@ -1,3 +1,5 @@
+#include <stdint.h>
+
 #define DIR 257
 #define PRIORITY 258
 #define PLUS 259
@@ -15,8 +17,8 @@
 #define SLASH 271
 #define HYPHEN 272
 typedef union {
-    u_int     num;
-    u_int32_t num32;
+    unsigned int num;
+    uint32_t num32;
     struct _val {
         int   len;
         char *buf;

=== modified file 'lib/opphip/wrap_db.h'
--- lib/opphip/wrap_db.h        2010-03-19 09:00:54 +0000
+++ lib/opphip/wrap_db.h        2010-03-29 19:28:37 +0000
@@ -6,6 +6,11 @@
 #ifndef HIP_LIB_OPPHIP_WRAP_DB_H
 #define HIP_LIB_OPPHIP_WRAP_DB_H
 
+#include <sys/types.h>
+#include <netinet/in.h>
+
+#include "lib/core/protodefs.h"
+
 struct hip_opp_socket_entry {
     pid_t                   pid;
     int                     orig_socket;

=== modified file 'lib/tool/checksum.h'
--- lib/tool/checksum.h 2010-03-09 21:23:38 +0000
+++ lib/tool/checksum.h 2010-03-29 19:28:37 +0000
@@ -1,8 +1,11 @@
 #ifndef HIP_LIB_CORE_CHECKSUM_H
 #define HIP_LIB_CORE_CHECKSUM_H
 
+#define _BSD_SOURCE
+
 #include <sys/types.h>
 #include <netinet/in.h>
+#include <netinet/ip.h>
 #include "lib/core/protodefs.h"
 
 uint16_t ipv4_checksum(uint8_t protocol, void *s, void *d, void *c, uint16_t 
len);

=== modified file 'lib/tool/pfkeysadb.h'
--- lib/tool/pfkeysadb.h        2010-03-18 13:02:44 +0000
+++ lib/tool/pfkeysadb.h        2010-03-29 19:28:37 +0000
@@ -1,6 +1,12 @@
 #ifndef HIP_LIB_TOOL_PFKEYSADB_H
 #define HIP_LIB_TOOL_PFKEYSADB_H
 
+/* required for caddr_t */
+#define _BSD_SOURCE
+
+#include <sys/socket.h>
+#include <sys/types.h>
+
 int getsadbpolicy(caddr_t *policy0, int *policylen0, int direction,
                   struct sockaddr *src, struct sockaddr *dst, u_int mode, int 
cmd);

Other related posts:

  • » [hipl-commit] [trunk] Rev 4079: Add missing headers to fix 'make checkheaders'. - Diego Biurrun