projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use libvdeplug.h instead of libvdeplug_dyn.h
[tinc]
/
src
/
ipv4.h
diff --git
a/src/ipv4.h
b/src/ipv4.h
index
997b88d
..
708e5c1
100644
(file)
--- a/
src/ipv4.h
+++ b/
src/ipv4.h
@@
-1,3
+1,6
@@
+#ifndef TINC_IPV4_H
+#define TINC_IPV4_H
+
/*
ipv4.h -- missing IPv4 related definitions
Copyright (C) 2005 Ivo Timmermans
/*
ipv4.h -- missing IPv4 related definitions
Copyright (C) 2005 Ivo Timmermans
@@
-18,8
+21,7
@@
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#ifndef __TINC_IPV4_H__
-#define __TINC_IPV4_H__
+#include "system.h"
#ifndef AF_INET
#define AF_INET 2
#ifndef AF_INET
#define AF_INET 2
@@
-64,11
+66,11
@@
#ifndef HAVE_STRUCT_IP
struct ip {
#if __BYTE_ORDER == __LITTLE_ENDIAN
#ifndef HAVE_STRUCT_IP
struct ip {
#if __BYTE_ORDER == __LITTLE_ENDIAN
- unsigned int ip_hl:4;
- unsigned int ip_v:4;
+ unsigned int ip_hl:
4;
+ unsigned int ip_v:
4;
#else
#else
- unsigned int ip_v:4;
- unsigned int ip_hl:4;
+ unsigned int ip_v:
4;
+ unsigned int ip_hl:
4;
#endif
uint8_t ip_tos;
uint16_t ip_len;
#endif
uint8_t ip_tos;
uint16_t ip_len;
@@
-81,7
+83,7
@@
struct ip {
uint8_t ip_p;
uint16_t ip_sum;
struct in_addr ip_src, ip_dst;
uint8_t ip_p;
uint16_t ip_sum;
struct in_addr ip_src, ip_dst;
-} __attribute__
((__gcc_struct__,
__packed__));
+} __attribute__
((__gcc_struct__)) __attribute((
__packed__));
#endif
#ifndef IP_OFFMASK
#endif
#ifndef IP_OFFMASK
@@
-143,7
+145,7
@@
struct icmp {
#define icmp_radv icmp_dun.id_radv
#define icmp_mask icmp_dun.id_mask
#define icmp_data icmp_dun.id_data
#define icmp_radv icmp_dun.id_radv
#define icmp_mask icmp_dun.id_mask
#define icmp_data icmp_dun.id_data
-} __attribute__
((__gcc_struct__,
__packed__));
+} __attribute__
((__gcc_struct__)) __attribute((
__packed__));
#endif
#endif
-#endif
/* __TINC_IPV4_H__ */
+#endif