mirror of
https://github.com/adtools/clib2.git
synced 2025-12-08 14:59:05 +00:00
- Broke down the tests for the __TIMEVAL_ALREADY_DEFINED and DEVICES_TIMER_H
symbols into two lines. git-svn-id: file:///Users/olsen/Code/migration-svn-zu-git/logical-line-staging/clib2/trunk@14721 87f5fb63-7c3d-0410-a384-fd976d0f7a62
This commit is contained in:
@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* $Id: time.h,v 1.3 2004-09-09 08:25:31 obarthel Exp $
|
* $Id: time.h,v 1.4 2004-09-09 08:30:31 obarthel Exp $
|
||||||
*
|
*
|
||||||
* :ts=4
|
* :ts=4
|
||||||
*
|
*
|
||||||
@ -52,7 +52,11 @@ extern "C" {
|
|||||||
structure and try to get by with this definition. Sometimes it works,
|
structure and try to get by with this definition. Sometimes it works,
|
||||||
sometimes it doesn't. Not sure if there really is a good solution for
|
sometimes it doesn't. Not sure if there really is a good solution for
|
||||||
this problem... */
|
this problem... */
|
||||||
#if !defined(__TIMEVAL_ALREADY_DEFINED) && !defined(DEVICES_TIMER_H)
|
#ifndef __TIMEVAL_ALREADY_DEFINED
|
||||||
|
|
||||||
|
/****************************************************************************/
|
||||||
|
|
||||||
|
#ifndef DEVICES_TIMER_H
|
||||||
|
|
||||||
/****************************************************************************/
|
/****************************************************************************/
|
||||||
|
|
||||||
@ -98,10 +102,6 @@ struct timeval
|
|||||||
|
|
||||||
/****************************************************************************/
|
/****************************************************************************/
|
||||||
|
|
||||||
#endif /* __TIMEVAL_ALREADY_DEFINED && DEVICES_TIMER_H */
|
|
||||||
|
|
||||||
/****************************************************************************/
|
|
||||||
|
|
||||||
#ifndef tv_sec
|
#ifndef tv_sec
|
||||||
#define tv_sec tv_secs
|
#define tv_sec tv_secs
|
||||||
#endif /* tv_sec */
|
#endif /* tv_sec */
|
||||||
@ -112,6 +112,14 @@ struct timeval
|
|||||||
|
|
||||||
/****************************************************************************/
|
/****************************************************************************/
|
||||||
|
|
||||||
|
#endif /* DEVICES_TIMER_H */
|
||||||
|
|
||||||
|
/****************************************************************************/
|
||||||
|
|
||||||
|
#endif /* __TIMEVAL_ALREADY_DEFINED */
|
||||||
|
|
||||||
|
/****************************************************************************/
|
||||||
|
|
||||||
struct timezone
|
struct timezone
|
||||||
{
|
{
|
||||||
int tz_minuteswest; /* of Greenwich */
|
int tz_minuteswest; /* of Greenwich */
|
||||||
|
|||||||
Reference in New Issue
Block a user