diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-01-02 13:40:13 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-01-02 13:40:13 +0100 |
| commit | 2b38e5af3eb58c27cc646fed11ac1a24805fa05d (patch) | |
| tree | 780bd8869c0ed798d8c0abce17869a29cc01fb01 /toolchain/uClibc | |
| parent | 2a2320b4292d4e370cc95aea61525ebd7dc11337 (diff) | |
| parent | 34592482701199604242848b80c39bd07b6c7716 (diff) | |
resolve merge conflict
Diffstat (limited to 'toolchain/uClibc')
| -rw-r--r-- | toolchain/uClibc/patches/netlinkaccess.patch | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/toolchain/uClibc/patches/netlinkaccess.patch b/toolchain/uClibc/patches/netlinkaccess.patch new file mode 100644 index 000000000..a022d53fa --- /dev/null +++ b/toolchain/uClibc/patches/netlinkaccess.patch @@ -0,0 +1,20 @@ +diff -Nur uClibc-0.9.32-rc1.orig/libc/inet/netlinkaccess.h uClibc-0.9.32-rc1/libc/inet/netlinkaccess.h +--- uClibc-0.9.32-rc1.orig/libc/inet/netlinkaccess.h 2010-12-17 20:05:17.000000000 +0100 ++++ uClibc-0.9.32-rc1/libc/inet/netlinkaccess.h 2011-01-01 15:49:58.906931975 +0100 +@@ -22,15 +22,8 @@ + #include <features.h> + #include <stdint.h> + #include <unistd.h> +-#include <sys/types.h> +- + #if defined __ASSUME_NETLINK_SUPPORT || defined __UCLIBC_USE_NETLINK__ +-#define _LINUX_TYPES_H +-typedef uint8_t __u8; +-typedef uint16_t __u16; +-typedef uint32_t __u32; +-typedef uint64_t __u64; +-typedef int32_t __s32; ++#include <asm/types.h> + #include <linux/rtnetlink.h> + #include <linux/netlink.h> + |