BSD 4_3_Reno release

[unix-history] / usr / src / sys / sys / time.h

diff --git a/usr/src/sys/sys/time.h b/usr/src/sys/sys/time.h
index 796f81e..984ec0a 100644 (file)
--- a/usr/src/sys/sys/time.h
+++ b/usr/src/sys/sys/time.h
@@ -1,4 +1,27 @@
-/*     time.h  4.2     83/05/21        */
+/*
+ * Copyright (c) 1982, 1986 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution is only permitted until one year after the first shipment
+ * of 4.4BSD by the Regents.  Otherwise, redistribution and use in source and
+ * binary forms are permitted provided that: (1) source distributions retain
+ * this entire copyright notice and comment, and (2) distributions including
+ * binaries display the following acknowledgement:  This product includes
+ * software developed by the University of California, Berkeley and its
+ * contributors'' in the documentation or other materials provided with the
+ * distribution and in all advertising materials mentioning features or use
+ * of this software.  Neither the name of the University nor the names of
+ * its contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * THIS SOFTWARE IS PROVIDED AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ *     @(#)time.h      7.4 (Berkeley) 6/28/90
+ */
+
+#ifndef _TIME_
+#define _TIME_

 
 /*
  * Structure returned by gettimeofday(2) system call,
 
 /*
  * Structure returned by gettimeofday(2) system call,


@@ -14,11 +37,17 @@ struct timezone {
        int     tz_dsttime;     /* type of dst correction */
 };
 #define        DST_NONE        0       /* not on dst */
        int     tz_dsttime;     /* type of dst correction */
 };
 #define        DST_NONE        0       /* not on dst */

-#define        DST_USA         1       /* usa style dst */
+#define        DST_USA         1       /* USA style dst */

 #define        DST_AUST        2       /* Australian style dst */
 #define        DST_AUST        2       /* Australian style dst */

+#define        DST_WET         3       /* Western European dst */
+#define        DST_MET         4       /* Middle European dst */
+#define        DST_EET         5       /* Eastern European dst */
+#define        DST_CAN         6       /* Canada */

 
 /*
  * Operations on timevals.
 
 /*
  * Operations on timevals.

+ *
+ * NB: timercmp does not work for >= or <=.

  */
 #define        timerisset(tvp)         ((tvp)->tv_sec || (tvp)->tv_usec)
 #define        timercmp(tvp, uvp, cmp) \
  */
 #define        timerisset(tvp)         ((tvp)->tv_sec || (tvp)->tv_usec)
 #define        timercmp(tvp, uvp, cmp) \


@@ -39,22 +68,8 @@ struct       itimerval {
        struct  timeval it_value;       /* current value */
 };
 
        struct  timeval it_value;       /* current value */
 };
 

-/*
- * Structure returned by gmtime and localtime calls (see ctime(3)).
- */
-struct tm {
-       int     tm_sec;
-       int     tm_min;
-       int     tm_hour;
-       int     tm_mday;
-       int     tm_mon;
-       int     tm_year;
-       int     tm_wday;
-       int     tm_yday;
-       int     tm_isdst;
-};
-

 #ifndef KERNEL
 #ifndef KERNEL

-extern struct tm *gmtime(), *localtime();
-extern char *asctime(), *ctime();
+#include <time.h>

 #endif
 #endif

+
+#endif /* _TIME_ */