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.10 by cebix, 2001-07-06T17:36:08Z

# Line 1 | Line 1
1   /*
2   *  timer_unix.cpp - Time Manager emulation, Unix specific stuff
3   *
4 < *  Basilisk II (C) 1997-1999 Christian Bauer
4 > *  Basilisk II (C) 1997-2001 Christian Bauer
5   *
6   *  This program is free software; you can redistribute it and/or modify
7   *  it under the terms of the GNU General Public License as published by
# Line 19 | Line 19
19   */
20  
21   #include "sysdeps.h"
22 + #include "macos_util.h"
23   #include "timer.h"
24  
25   #define DEBUG 0
26   #include "debug.h"
27  
28 + // For NetBSD with broken pthreads headers
29 + #ifndef CLOCK_REALTIME
30 + #define CLOCK_REALTIME 0
31 + #endif
32 +
33  
34   /*
35   *  Return microseconds since boot (64 bit)
# Line 50 | Line 56 | void Microseconds(uint32 &hi, uint32 &lo
56   *  Return local date/time in Mac format (seconds since 1.1.1904)
57   */
58  
53 const uint32 TIME_OFFSET = 0x7c25b080;  // Offset Mac->Unix time in seconds
54
59   uint32 TimerDateTime(void)
60   {
61 <        time_t uct_now = time(NULL);
58 <        long tz = timezone;
59 <        time_t local_now = uct_now - tz;
60 <        if (daylight)
61 <                local_now += 3600;
62 <        return (uint32)local_now + TIME_OFFSET;
61 >        return TimeToMacTime(time(NULL));
62   }
63  
64  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines