[PATCH] linux/time.h name space pollution in 2.4.0-test11-pre6/pre7

• Next message: Linus Torvalds: "Re: Freeze on FPU exception with Athlon"
• Previous message: Rogier Wolff: "Re: Linux 2.2.18pre21"
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

Hi Linus,

include/linux/time.h leaks out mktime, creating a possible conflict with
POSIX mktime. This patch puts mktime and a few helper functions into
#ifdef __KERNEL__

Originally for 2.4.0-test11-pre6, but applies also to 2.4.0-test11-pre7

Cheers, Werner

---------------------------------- cut here -----------------------------------

--- linux.orig/include/linux/time.h Mon Oct 2 20:01:17 2000
+++ linux/include/linux/time.h Sat Nov 18 18:45:15 2000
@@ -12,6 +12,8 @@
 };
 #endif /* _STRUCT_TIMESPEC */
 
+#ifdef __KERNEL__
+
 /*
  * Change timeval to jiffies, trying to avoid the
  * most obvious overflows..
@@ -79,6 +81,8 @@
           )*60 + min /* now have minutes */
         )*60 + sec; /* finally seconds */
 }
+
+#endif /* __KERNEL__ */
 
 
 struct timeval {

-- 
  _________________________________________________________________________
 / Werner Almesberger, ICA, EPFL, CH           Werner.Almesberger@epfl.ch /
/_IN_N_032__Tel_+41_21_693_6621__Fax_+41_21_693_6610_____________________/
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
Please read the FAQ at http://www.tux.org/lkml/

• Next message: Linus Torvalds: "Re: Freeze on FPU exception with Athlon"
• Previous message: Rogier Wolff: "Re: Linux 2.2.18pre21"
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

This archive was generated by hypermail 2b29 : Thu Nov 23 2000 - 21:00:15 EST