diff options
| author | Elliott Hughes <enh@google.com> | 2014-02-08 01:04:19 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-02-08 01:04:19 +0000 |
| commit | 4c0b72f278ab643208d4a88c326acbe0292dfe50 (patch) | |
| tree | 3e881151c04b2ffe7926400fb4fb462934ec9982 | |
| parent | 16515c226654906be74093eaa0bb4af8a72ed3ef (diff) | |
| parent | 37aaf36719addeaaf717fb1183eb3336254fef99 (diff) | |
| download | iptables-4c0b72f278ab643208d4a88c326acbe0292dfe50.tar.gz | |
Merge "Post-uapi cleanup."
| -rw-r--r-- | include/linux/types.h | 41 |
1 files changed, 0 insertions, 41 deletions
diff --git a/include/linux/types.h b/include/linux/types.h deleted file mode 100644 index 108a3a64..00000000 --- a/include/linux/types.h +++ /dev/null @@ -1,41 +0,0 @@ -#ifndef _LINUX_TYPES_H -#define _LINUX_TYPES_H - -/* TODO: remove this file and use our uapi headers instead. */ -#define __aligned_u64 __u64 __attribute__((aligned(8))) - -#include <asm/types.h> - -#ifndef __ASSEMBLY__ - -#include <linux/posix_types.h> - - -/* - * Below are truly Linux-specific types that should never collide with - * any application/library that wants linux/types.h. - */ - -#ifdef __CHECKER__ -#define __bitwise__ __attribute__((bitwise)) -#else -#define __bitwise__ -#endif -#ifdef __CHECK_ENDIAN__ -#define __bitwise __bitwise__ -#else -#define __bitwise -#endif - -typedef __u16 __bitwise __le16; -typedef __u16 __bitwise __be16; -typedef __u32 __bitwise __le32; -typedef __u32 __bitwise __be32; -typedef __u64 __bitwise __le64; -typedef __u64 __bitwise __be64; - -typedef __u16 __bitwise __sum16; -typedef __u32 __bitwise __wsum; - -#endif /* __ASSEMBLY__ */ -#endif /* _LINUX_TYPES_H */ |