tn3399_openwrt/target/linux/generic-2.6/patches/900-headers_type_and_time.patch
Gabor Juhos 6761ddd557 refresh generic 2.6.21 patches
SVN-Revision: 11185
2008-05-18 20:23:20 +00:00

51 lines
1.2 KiB
Diff

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.