]>
Commit | Line | Data |
---|---|---|
93cb4bb5 PS |
1 | --- libnl-1.0-pre5/include/netlink-local.h.orig 2006-10-31 08:05:18.369442750 +0000 |
2 | +++ libnl-1.0-pre5/include/netlink-local.h 2006-10-31 08:06:19.450708000 +0000 | |
3 | @@ -30,11 +30,7 @@ | |
4 | #include <arpa/inet.h> | |
5 | #include <netdb.h> | |
6 | ||
7 | -typedef uint8_t __u8; | |
8 | -typedef uint16_t __u16; | |
9 | -typedef uint32_t __u32; | |
10 | -typedef int32_t __s32; | |
11 | -typedef uint64_t __u64; | |
12 | +#include <linux/types.h> | |
13 | ||
14 | /* local header copies */ | |
15 | #include <linux/if.h> | |
16 | --- libnl-1.0-pre5/lib/addr.c.orig 2006-10-31 08:04:12.434302000 +0000 | |
17 | +++ libnl-1.0-pre5/lib/addr.c 2006-10-31 08:04:28.735167250 +0000 | |
18 | @@ -29,7 +29,7 @@ | |
19 | #include <netlink/netlink.h> | |
20 | #include <netlink/utils.h> | |
21 | #include <netlink/addr.h> | |
22 | -#include <linux/socket.h> | |
23 | +#include <sys/socket.h> | |
24 | ||
25 | /* All this DECnet stuff is stolen from iproute2, thanks to whoever wrote | |
26 | * this, probably Alexey. */ | |
27 | --- libnl-1.0-pre5/lib/attr.c.orig 2006-10-31 08:07:17.453320750 +0000 | |
28 | +++ libnl-1.0-pre5/lib/attr.c 2006-10-31 08:07:27.313005250 +0000 | |
29 | @@ -15,7 +15,7 @@ | |
30 | #include <netlink/addr.h> | |
31 | #include <netlink/attr.h> | |
32 | #include <netlink/msg.h> | |
33 | -#include <linux/socket.h> | |
34 | +#include <sys/socket.h> | |
35 | ||
36 | /** | |
37 | * @ingroup nl | |
4c013d7e PS |
38 | --- libnl-1.0-pre5/lib/data.c.orig 2006-10-31 08:14:56.930600500 +0000 |
39 | +++ libnl-1.0-pre5/lib/data.c 2006-10-31 08:15:16.895848250 +0000 | |
40 | @@ -18,7 +18,7 @@ | |
41 | #include <netlink-local.h> | |
42 | #include <netlink/netlink.h> | |
43 | #include <netlink/utils.h> | |
44 | -#include <linux/socket.h> | |
45 | +#include <sys/socket.h> | |
46 | ||
47 | /** | |
48 | * @name General | |
49 | --- libnl-1.0-pre5/lib/msg.c.orig 2006-10-31 08:15:00.606830250 +0000 | |
50 | +++ libnl-1.0-pre5/lib/msg.c 2006-10-31 08:15:34.472946750 +0000 | |
51 | @@ -152,7 +152,7 @@ | |
52 | #include <netlink/utils.h> | |
53 | #include <netlink/cache.h> | |
54 | #include <netlink/attr.h> | |
55 | -#include <linux/socket.h> | |
56 | +#include <sys/socket.h> | |
57 | ||
58 | /** | |
59 | * @name Size Calculations | |
60 | --- libnl-1.0-pre5/lib/utils.c.orig 2006-10-31 08:15:04.315062000 +0000 | |
61 | +++ libnl-1.0-pre5/lib/utils.c 2006-10-31 08:15:50.317937000 +0000 | |
62 | @@ -17,7 +17,7 @@ | |
63 | #include <netlink-local.h> | |
64 | #include <netlink/netlink.h> | |
65 | #include <netlink/utils.h> | |
66 | -#include <linux/socket.h> | |
67 | +#include <sys/socket.h> | |
68 | ||
69 | /** | |
70 | * Debug level |