github/amiga-clib2
1
0
Fork 0
mirror of https://github.com/adtools/clib2.git synced 2025-12-08 14:59:05 +00:00
Code Issues Releases Wiki Activity

- Removed the timeval/TimeVal change workaround and replaced it with something

Browse Source 
cleaner.


git-svn-id: file:///Users/olsen/Code/migration-svn-zu-git/logical-line-staging/clib2/trunk@15171 87f5fb63-7c3d-0410-a384-fd976d0f7a62
This commit is contained in:
Olaf Barthel
2006-12-28 14:30:57 +00:00
parent 3a0324e4ff
commit ca1fc13792
1 changed files with 23 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
library/time_gettimeofday.c
View File

@@ -1,5 +1,5 @@
/* /*
* $Id: time_gettimeofday.c,v 1.11 2006-09-27 09:40:06 obarthel Exp $ * $Id: time_gettimeofday.c,v 1.12 2006-12-28 14:30:57 obarthel Exp $
* *
* :ts=4 * :ts=4
* *
@@ -59,23 +59,6 @@
/****************************************************************************/ /****************************************************************************/
/* A quick workaround for the timeval/timerequest->TimeVal/TimeRequest
change in the recent OS4 header files. */
#if defined(__NEW_TIMEVAL_DEFINITION_USED__)
#define timeval TimeVal
#define tv_secs Seconds
#define tv_micro Microseconds
#define timerequest TimeRequest
#define tr_node Request
#define tr_time Time
#endif /* __NEW_TIMEVAL_DEFINITION_USED__ */
/****************************************************************************/
int int
gettimeofday(struct timeval *tp, struct timezone *tzp) gettimeofday(struct timeval *tp, struct timezone *tzp)
{ {
@@ -86,19 +69,37 @@ gettimeofday(struct timeval *tp, struct timezone *tzp)
#endif /* __amigaos4__ */ #endif /* __amigaos4__ */
ULONG seconds,microseconds; ULONG seconds,microseconds;
struct timeval tv;
ENTER(); ENTER();
/* Obtain the current system time. */ /* Obtain the current system time. */
PROFILE_OFF(); PROFILE_OFF();
GetSysTime(&tv);
#if defined(__NEW_TIMEVAL_DEFINITION_USED__)
{
struct TimeVal tv;
GetSysTime(&tv);
seconds = tv.Seconds;
microseconds = tv.Microseconds;
}
#else
{
struct timeval tv;
GetSysTime(&tv);
seconds = tv.tv_sec;
microseconds = tv.tv_usec;
}
#endif /* __NEW_TIMEVAL_DEFINITION_USED__ */
PROFILE_ON(); PROFILE_ON();
/* Convert the number of seconds so that they match the Unix epoch, which /* Convert the number of seconds so that they match the Unix epoch, which
starts (January 1st, 1970) eight years before the AmigaOS epoch. */ starts (January 1st, 1970) eight years before the AmigaOS epoch. */
seconds = tv.tv_sec + UNIX_TIME_OFFSET; seconds += UNIX_TIME_OFFSET;
microseconds = tv.tv_usec;
__locale_lock(); __locale_lock();