BSD 4_3_Reno release

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

diff --git a/usr/src/include/time.h b/usr/src/include/time.h
index 52906ee..454e926 100644 (file)
--- a/usr/src/include/time.h
+++ b/usr/src/include/time.h
@@ -2,12 +2,24 @@
  * Copyright (c) 1989 The Regents of the University of California.
  * All rights reserved.
  *
  * Copyright (c) 1989 The Regents of the University of California.
  * All rights reserved.
  *

- * %sccs.include.redist.c%
+ * 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      5.8 (Berkeley) %G%
+ *     @(#)time.h      5.6 (Berkeley) 6/23/90

  */
 
  */
 

-#include <machine/types.h>
+#include <machine/machtypes.h>

 
 #ifndef        NULL
 #define        NULL    0
 
 #ifndef        NULL
 #define        NULL    0


@@ -47,7 +59,6 @@ extern struct tm *gmtime(const time_t *);
 extern struct tm *localtime(const time_t *);
 extern time_t mktime(const struct tm *);
 extern time_t time(time_t *);
 extern struct tm *localtime(const time_t *);
 extern time_t mktime(const struct tm *);
 extern time_t time(time_t *);

-extern clock_t clock(void);

 extern double difftime(const time_t, const time_t);
 extern char *asctime(const struct tm *);
 extern char *ctime(const time_t *);
 extern double difftime(const time_t, const time_t);
 extern char *asctime(const struct tm *);
 extern char *ctime(const time_t *);


@@ -57,7 +68,6 @@ extern void tzsetwall(void);
 #else
 extern struct tm *gmtime();
 extern struct tm *localtime();
 #else
 extern struct tm *gmtime();
 extern struct tm *localtime();

-extern clock_t clock();

 extern time_t mktime();
 extern time_t time();
 extern double difftime();
 extern time_t mktime();
 extern time_t time();
 extern double difftime();