diff options
| author | schmidt <douglascraigschmidt@users.noreply.github.com> | 2009-07-17 19:04:11 +0000 |
|---|---|---|
| committer | schmidt <douglascraigschmidt@users.noreply.github.com> | 2009-07-17 19:04:11 +0000 |
| commit | 06adb9b40b9ae62513f64ecd870a07b0a96f97cc (patch) | |
| tree | 9a279b27111dde88aaae2369bcb425d469dcc303 /ACE | |
| parent | b04255cf645c6ded9d7c0ef180239b337defaaf3 (diff) | |
| download | ATCD-06adb9b40b9ae62513f64ecd870a07b0a96f97cc.tar.gz | |
ChangeLogTag:Fri
Diffstat (limited to 'ACE')
| -rw-r--r-- | ACE/ChangeLog | 6 | ||||
| -rw-r--r-- | ACE/THANKS | 1 | ||||
| -rw-r--r-- | ACE/ace/OS_NS_time.cpp | 1 |
3 files changed, 8 insertions, 0 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index 9167f3a0ca3..c40849cf31f 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,9 @@ +Fri Jul 17 18:32:45 UTC 2009 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> + + * ace/OS_NS_time.cpp (mktime): Set t_sys.wMilliseconds to 0 so + it's initialized properly. Thanks to Ryan Carmichael + <RCarmichael at drs-tem dot com> for this fix. + Fri Jul 17 14:36:12 UTC 2009 Marcel Smit <msmit@remedy.nl> * apps/JAWS/server/HTTP_Response.cpp: diff --git a/ACE/THANKS b/ACE/THANKS index f139c962211..3befe254f54 100644 --- a/ACE/THANKS +++ b/ACE/THANKS @@ -2293,6 +2293,7 @@ Steven Hartmann <shartmann at militho dot com> Dicky <qianchendi at gmail dot com> Boyan Kasarov <bkasarov at gmail dot com> Brendan Murphy <brendan dot murphy at euro dot apple dot com> +Ryan Carmichael <RCarmichael at drs-tem dot com> I would particularly like to thank Paul Stephenson, who worked with me at Ericsson in the early 1990's. Paul devised the recursive Makefile diff --git a/ACE/ace/OS_NS_time.cpp b/ACE/ace/OS_NS_time.cpp index 19be27b7579..132d200175a 100644 --- a/ACE/ace/OS_NS_time.cpp +++ b/ACE/ace/OS_NS_time.cpp @@ -319,6 +319,7 @@ ACE_OS::mktime (struct tm *t) t_sys.wMonth = t->tm_mon + 1; // SYSTEMTIME is 1-indexed, tm is 0-indexed t_sys.wYear = t->tm_year + 1900; // SYSTEMTIME is real; tm is since 1900 t_sys.wDayOfWeek = t->tm_wday; // Ignored in below function call. + t_sys.wMilliseconds = 0; if (SystemTimeToFileTime (&t_sys, &t_file) == 0) return -1; ACE_Time_Value tv (t_file); |