diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2012-08-21 12:22:17 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2012-08-21 12:22:17 +0000 |
| commit | d6ff06f0a2cd85bd42b2905431a5d546b35221f3 (patch) | |
| tree | 1306cd1cb01aec2d7d7f1fd7bc7f20e17d1577db | |
| parent | 38664a4c159906342d744c9f4d724d1098dfa715 (diff) | |
| download | ATCD-d6ff06f0a2cd85bd42b2905431a5d546b35221f3.tar.gz | |
Tue Aug 21 12:20:43 UTC 2012 Johnny Willemsen <jwillemsen@remedy.nl>
* ace/os_include/sys/os_types.h:
Fixed HPUX problem
| -rw-r--r-- | ACE/ChangeLog | 5 | ||||
| -rw-r--r-- | ACE/ace/os_include/sys/os_types.h | 14 |
2 files changed, 12 insertions, 7 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index d50e49278d3..51612fd3d40 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,8 @@ +Tue Aug 21 12:20:43 UTC 2012 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/os_include/sys/os_types.h: + Fixed HPUX problem + Tue Aug 21 02:45:07 UTC 2012 Phil Mesnier <mesnier_p@ociweb.com> * ace/config-macosx-leopard.h: diff --git a/ACE/ace/os_include/sys/os_types.h b/ACE/ace/os_include/sys/os_types.h index 4c9b45f9e34..bbd5e6736fa 100644 --- a/ACE/ace/os_include/sys/os_types.h +++ b/ACE/ace/os_include/sys/os_types.h @@ -50,15 +50,15 @@ typedef double ACE_timer_t; // todo: don't forget to clean this up! ;-) #if !defined (ACE_HAS_CLOCK_GETTIME) && !(defined (_CLOCKID_T_) || defined (_CLOCKID_T)) typedef int clockid_t; -#endif /* ! ACE_HAS_CLOCK_GETTIME && ! _CLOCKID_T_ */ -#if !defined (CLOCK_REALTIME) -# define CLOCK_REALTIME 0 -#endif /* CLOCK_REALTIME */ +# if !defined (CLOCK_REALTIME) +# define CLOCK_REALTIME 0 +# endif /* CLOCK_REALTIME */ -#if !defined (CLOCK_MONOTONIC) -# define CLOCK_MONOTONIC 1 -#endif /* CLOCK_MONOTONIC */ +# if !defined (CLOCK_MONOTONIC) +# define CLOCK_MONOTONIC 1 +# endif /* CLOCK_MONOTONIC */ +#endif /* ! ACE_HAS_CLOCK_GETTIME && ! _CLOCKID_T_ */ #if defined (ACE_LACKS_DEV_T) typedef unsigned int dev_t; |