Fixes for the watcom makefiles:

[cc65] / include / time.h

diff --git a/include/time.h b/include/time.h
index fd3a0d06837ebc2a27fb906c278351da9a119891..7cff2d7c32ecd2705af869739e4c5d15f495ee12 100644 (file)
--- a/include/time.h
+++ b/include/time.h
@@ -6,10 +6,10 @@
 /*                                                                           */
 /*                                                                           */
 /*                                                                           */
-/* (C) 1998-2002 Ullrich von Bassewitz                                       */
-/*               Wacholderweg 14                                             */
-/*               D-70597 Stuttgart                                           */
-/* EMail:        uz@musoftware.de                                            */
+/* (C) 1998-2005 Ullrich von Bassewitz                                       */
+/*               Römerstrasse 52                                             */
+/*               D-70794 Filderstadt                                         */
+/* EMail:        uz@cc65.org                                                 */
 /*                                                                           */
 /*                                                                           */
 /* This software is provided 'as-is', without any expressed or implied       */
@@ -39,14 +39,14 @@
 
 
 /* NULL pointer */
-#ifdef NULL
-#  undef NULL
-#endif
+#ifndef _HAVE_NULL
 #define NULL   0
+#define _HAVE_NULL
+#endif
 
 /* size_t is needed */
-#ifndef _SIZE_T
-#define _SIZE_T
+#ifndef _HAVE_size_t
+#define _HAVE_size_t
 typedef unsigned size_t;
 #endif
 
@@ -54,7 +54,7 @@ typedef unsigned long time_t;
 typedef unsigned long clock_t;
 
 /* Structure for broken down time */
-struct tm {
+struct tm {     
     int            tm_sec;
     int     tm_min;
     int     tm_hour;
@@ -76,7 +76,15 @@ extern struct _timezone {
 
 
 
-#if defined(__CBM__)
+#if defined(__ATARI__)
+/* The clock depends on the video standard, so read it at runtime */
+unsigned _clocks_per_sec (void);
+#  define CLK_TCK              _clocks_per_sec()
+#  define CLOCKS_PER_SEC       _clocks_per_sec()
+#elif defined(__ATMOS__)
+#  define CLK_TCK                      100     /* POSIX */
+#  define CLOCKS_PER_SEC       100     /* ANSI */
+#elif defined(__CBM__)
 #  if defined(__CBM510__) || defined(__CBM610__)
 /* The 510/610 gets its clock from the AC current */
 #    define CLK_TCK                    50      /* POSIX */
@@ -85,13 +93,12 @@ extern struct _timezone {
 #    define CLK_TCK            60      /* POSIX */
 #    define CLOCKS_PER_SEC     60      /* ANSI */
 #  endif
-#endif
-
-#if defined(__ATARI__)
-/* The clock depends on the video standard, so read it at runtime */
-unsigned _clocks_per_sec (void);
-#  define CLK_TCK              _clocks_per_sec()
-#  define CLOCKS_PER_SEC       _clocks_per_sec()
+#elif defined(__NES__)
+#  define CLK_TCK              50      /* POSIX */
+#  define CLOCKS_PER_SEC       50      /* ANSI */
+#elif  defined(__GEOS__)
+#  define CLK_TCK              1       /* POSIX */
+#  define CLOCKS_PER_SEC       1       /* ANSI */
 #endif