diff options
author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2008-09-21 11:25:17 +0000 |
---|---|---|
committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2008-09-21 11:25:17 +0000 |
commit | e0c1b38c1c38b468f37ac5061837b5e359cbf371 (patch) | |
tree | 372b1ac6b288786e28708d100e5c5dac898cf37f /target/linux/generic-2.6/patches-2.6.21/900-headers_type_and_time.patch | |
parent | 7f44d09489bcbe4292a8bf245dd6d6a1370f238c (diff) |
rename generic-2.6/patches to generic-2.6/patches-2.6.21
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@12636 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic-2.6/patches-2.6.21/900-headers_type_and_time.patch')
-rw-r--r-- | target/linux/generic-2.6/patches-2.6.21/900-headers_type_and_time.patch | 50 |
1 files changed, 50 insertions, 0 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.21/900-headers_type_and_time.patch b/target/linux/generic-2.6/patches-2.6.21/900-headers_type_and_time.patch new file mode 100644 index 000000000..3029ce28e --- /dev/null +++ b/target/linux/generic-2.6/patches-2.6.21/900-headers_type_and_time.patch @@ -0,0 +1,50 @@ +Index: linux-2.6.21.7/include/linux/time.h +=================================================================== +--- linux-2.6.21.7.orig/include/linux/time.h ++++ linux-2.6.21.7/include/linux/time.h +@@ -1,6 +1,10 @@ + #ifndef _LINUX_TIME_H + #define _LINUX_TIME_H + ++#ifndef __KERNEL__ ++#include <time.h> ++#else ++ + #include <linux/types.h> + + #ifdef __KERNEL__ +@@ -224,4 +228,6 @@ struct itimerval { + */ + #define TIMER_ABSTIME 0x01 + ++#endif /* __KERNEL__ DEBIAN */ ++ + #endif +Index: linux-2.6.21.7/include/linux/types.h +=================================================================== +--- linux-2.6.21.7.orig/include/linux/types.h ++++ linux-2.6.21.7/include/linux/types.h +@@ -1,6 +1,14 @@ + #ifndef _LINUX_TYPES_H + #define _LINUX_TYPES_H + ++/* Debian: Use userland types instead. */ ++#ifndef __KERNEL__ ++# include <sys/types.h> ++/* For other kernel headers. */ ++# include <linux/posix_types.h> ++# include <asm/types.h> ++#else ++ + #ifdef __KERNEL__ + + #define BITS_TO_LONGS(bits) \ +@@ -162,6 +170,8 @@ typedef unsigned long blkcnt_t; + + #endif /* __KERNEL_STRICT_NAMES */ + ++#endif /* __KERNEL__ DEBIAN */ ++ + /* + * Below are truly Linux-specific types that should never collide with + * any application/library that wants linux/types.h. |