ViewVC Help
View File | Revision Log | Show Annotations | Revision Graph | Root Listing
root/cebix/BasiliskII/src/Unix/timer_unix.cpp
(Generate patch)

Comparing BasiliskII/src/Unix/timer_unix.cpp (file contents):
Revision 1.2 by cebix, 1999-10-14T16:05:18Z vs.
Revision 1.6 by cebix, 2000-02-21T20:04:18Z

# Line 50 | Line 50 | void Microseconds(uint32 &hi, uint32 &lo
50   *  Return local date/time in Mac format (seconds since 1.1.1904)
51   */
52  
53 const uint32 TIME_OFFSET = 0x7c25b080;  // Offset Mac->Unix time in seconds
54
53   uint32 TimerDateTime(void)
54   {
55 <        time_t uct_now = time(NULL);
56 <        long tz = timezone;
57 <        time_t local_now = uct_now - tz;
58 <        if (daylight)
59 <                local_now += 3600;
55 >        time_t utc_now = time(NULL);
56 > #if defined(__linux__) || defined(__SVR4)
57 >        time_t local_now = utc_now - timezone;
58 > #elif defined(__FreeBSD__) || defined(__NetBSD__)
59 >        time_t local_now = utc_now + localtime(&utc_now)->tm_gmtoff;
60 > #else
61 >        time_t local_now = utc_now;
62 > #endif
63          return (uint32)local_now + TIME_OFFSET;
64   }
65  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines