aboutsummaryrefslogtreecommitdiff
path: root/time/mktime.c
diff options
context:
space:
mode:
Diffstat (limited to 'time/mktime.c')
-rw-r--r--time/mktime.c40
1 files changed, 6 insertions, 34 deletions
diff --git a/time/mktime.c b/time/mktime.c
index 673bb48..88ac723 100644
--- a/time/mktime.c
+++ b/time/mktime.c
@@ -25,18 +25,8 @@
# include <config.h>
#endif
-/* Some systems require that one of these symbols be defined in
- order to declare localtime_r properly. */
-#ifndef __EXTENSIONS__
-# define __EXTENSIONS__ 1
-#endif
-#ifndef _POSIX_THREAD_SAFE_FUNCTIONS
-# define _POSIX_THREAD_SAFE_FUNCTIONS 1
-#endif
-
#ifdef _LIBC
# define HAVE_LIMITS_H 1
-# define HAVE_LOCALTIME_R 1
# define STDC_HEADERS 1
#endif
@@ -47,12 +37,6 @@
# define LEAP_SECONDS_POSSIBLE 1
#endif
-/* Some systems require <unistd.h> to be included before <time.h>
- for localtime_r to be declared properly. */
-#if HAVE_UNISTD_H
-# include <unistd.h>
-#endif
-
#include <sys/types.h> /* Some systems define `time_t' here. */
#include <time.h>
@@ -132,35 +116,23 @@ time_t __mktime_internal __P ((struct tm *,
#ifdef _LIBC
-# define localtime_r __localtime_r
+# define my_mktime_localtime_r __localtime_r
#else
-# if HAVE_LOCALTIME_R == defined localtime_r
-/* Provide our own substitute for a missing or possibly broken localtime_r. */
+/* If we're a mktime substitute in a GNU program, then prefer
+ localtime to localtime_r, since many localtime_r implementations
+ are buggy. */
static struct tm *my_mktime_localtime_r __P ((const time_t *, struct tm *));
static struct tm *
my_mktime_localtime_r (t, tp)
const time_t *t;
struct tm *tp;
{
-# ifdef localtime_r
- /* Digital Unix 4.0A and 4.0D have a macro localtime_r with the
- standard meaning, along with an unwanted, nonstandard function
- localtime_r. The placeholder function my_mktime_localtime_r
- invokes the macro; use that instead of the system's bogus
- localtime_r. */
- return localtime_r (t, tp);
-# undef localtime_r
-# else /* ! defined (localtime_r) */
- /* Approximate localtime_r as best we can in its absence. */
struct tm *l = localtime (t);
if (! l)
return 0;
*tp = *l;
return tp;
-# endif /* ! defined localtime_r */
}
-# define localtime_r my_mktime_localtime_r
-# endif /* HAVE_LOCALTIME_R == defined localtime_r */
#endif /* ! _LIBC */
@@ -215,7 +187,7 @@ mktime (tp)
__tzset ();
#endif
- return __mktime_internal (tp, localtime_r, &localtime_offset);
+ return __mktime_internal (tp, my_mktime_localtime_r, &localtime_offset);
}
/* Use CONVERT to convert *T to a broken down time in *TP.
@@ -565,6 +537,6 @@ main (argc, argv)
/*
Local Variables:
-compile-command: "gcc -DDEBUG -D__EXTENSIONS__ -DHAVE_LIMITS_H -DHAVE_LOCALTIME_R -DSTDC_HEADERS -Wall -W -O -g mktime.c -o mktime"
+compile-command: "gcc -DDEBUG -DHAVE_LIMITS_H -DSTDC_HEADERS -Wall -W -O -g mktime.c -o mktime"
End:
*/