summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--winsup/cygwin/ChangeLog3
-rw-r--r--winsup/cygwin/times.cc9
2 files changed, 11 insertions, 1 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 4b81d02d0..4c9903f10 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,6 +1,7 @@
Sat Mar 18 23:04:27 2000 Christopher Faylor <cgf@cygnus.com>
- * times.cc: Remove unneeded (and incorrect) externs.
+ * times.cc: Fix extern declarations for variables that are exported but
+ used by this modules.
Sat Mar 18 01:32:04 2000 Christopher Faylor <cgf@cygnus.com>
diff --git a/winsup/cygwin/times.cc b/winsup/cygwin/times.cc
index 51f5d0898..738d84f82 100644
--- a/winsup/cygwin/times.cc
+++ b/winsup/cygwin/times.cc
@@ -8,6 +8,10 @@ This software is a copyrighted work licensed under the terms of the
Cygwin license. Please consult the file "CYGWIN_LICENSE" for
details. */
+/* Hide definitions from the library since they contain the
+ "dllimport" attribute. */
+#define _timezone dummy_timezone
+#define _daylight dummy_daylight
#include <time.h>
#include <sys/times.h>
#include <sys/timeb.h>
@@ -17,6 +21,11 @@ details. */
#include <errno.h>
#include "winsup.h"
+#undef _timezone
+#undef _daylight
+extern time_t _timezone;
+extern int _daylight;
+
#define FACTOR (0x19db1ded53ea710LL)
#define NSPERSEC 10000000LL