Fl_Clock_Output depended on a time value that was the same as an

unsigned long, which is incorrect for WIN64 and VC++ 2005 (STR
#1079)



git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@4701 ea41ed52-d2ee-0310-a9c1-e6b18d33e121

2 files changed, 6 insertions, 1 deletions

diff --git a/CHANGES b/CHANGES
index 24160a4dc..c3cac8669 100644
--- a/CHANGES
+++ b/CHANGES
@@ -3,6 +3,9 @@ CHANGES IN FLTK 1.1.7
 	- Documentation fixes (STR #571, STR #648, STR #692, STR
 	  #730, STR #744, STR #745, STR #931, STR #942, STR #960,
 	  STR #969)
+	- Fl_Clock_Output depended on a time value that was the
+	  same as an unsigned long, which is incorrect for WIN64
+	  and VC++ 2005 (STR #1079)
 	- Fl_Text_Display::wrap_mode() would crash if no buffer
 	  was associated with the widget (STR #1069)
 	- Updated the default label and text colors of all widgets
diff --git a/src/Fl_Clock.cxx b/src/Fl_Clock.cxx
index 0cc8e2dbf..edb6749c4 100644
--- a/src/Fl_Clock.cxx
+++ b/src/Fl_Clock.cxx
@@ -119,7 +119,9 @@ void Fl_Clock_Output::value(int H, int m, int s) {
 void Fl_Clock_Output::value(ulong v) {
   value_ = v;
   struct tm *timeofday;
-  timeofday = localtime((const time_t *)&v);
+  // Some platforms, notably Windows, now use a 64-bit time_t value...
+  time_t vv = (time_t)v;
+  timeofday = localtime(&vv);
   value(timeofday->tm_hour, timeofday->tm_min, timeofday->tm_sec);
 }