Sophie

Sophie

distrib > Arklinux > devel > i586 > by-pkgid > 9e6e445b4efd873f0ea565fdb7c9f225 > files > 8

eglibc-2.14-2ark.src.rpm

--- glibc-2.3.2/time/sys/time.h.bero	2003-03-05 00:46:39.000000000 +0100
+++ glibc-2.3.2/time/sys/time.h	2003-03-05 00:47:05.000000000 +0100
@@ -87,7 +87,7 @@
 		    struct timeval *__olddelta) __THROW;
 #endif
 
-
+#ifndef ITIMER_REAL /* don't conflict with the kernel's linux/time.h */
 /* Values for the first argument to `getitimer' and `setitimer'.  */
 enum __itimer_which
   {
@@ -102,6 +102,7 @@
     ITIMER_PROF = 2
 #define ITIMER_PROF ITIMER_PROF
   };
+#endif
 
 /* Type of the second argument to `getitimer' and
    the second and third arguments `setitimer'.  */