diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2023-01-15 10:33:43 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-15 10:33:43 +0100 |
| commit | 6f36dbed40cbedb60f2c40376d360c704d7db93b (patch) | |
| tree | e06a025f1f6565b4f6301497a87cb576d3153b7e | |
| parent | f06824b2d9f47924a09f235281220ed84cfe286a (diff) | |
| parent | b488f1ab8719835737d42ba4658cd18f352d0ad4 (diff) | |
| download | ATCD-6f36dbed40cbedb60f2c40376d360c704d7db93b.tar.gz | |
Merge pull request #2023 from esohns/issue_2016_move_make_qword
move ACE_Make_QWORD to OS_NS_macros.h
| -rw-r--r-- | ACE/ace/OS_NS_macros.h | 14 | ||||
| -rw-r--r-- | ACE/ace/OS_NS_time.h | 5 |
2 files changed, 13 insertions, 6 deletions
diff --git a/ACE/ace/OS_NS_macros.h b/ACE/ace/OS_NS_macros.h index e901019ddb0..ac1c5e2f941 100644 --- a/ACE/ace/OS_NS_macros.h +++ b/ACE/ace/OS_NS_macros.h @@ -76,7 +76,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL LONG -inline ACE_High_Part (ACE_OFF_T value) +inline ACE_High_Part (LONGLONG value) { LARGE_INTEGER new_value; new_value.QuadPart = value; @@ -102,6 +102,18 @@ ACE_END_VERSIONED_NAMESPACE_DECL # endif /* _FILE_OFFSET_BITS==64 */ #endif /* ACE_WIN32 */ +// 64-bit quad-word definitions. +#if defined (ACE_WIN32) +# if defined (_FILE_OFFSET_BITS) && (_FILE_OFFSET_BITS == 64) +ACE_BEGIN_VERSIONED_NAMESPACE_DECL +typedef unsigned __int64 ACE_QWORD; +inline ACE_QWORD ACE_Make_QWORD (DWORD lo, DWORD hi) { return ACE_QWORD (lo) | (ACE_QWORD (hi) << 32); } +inline DWORD ACE_Low_DWORD (ACE_QWORD q) { return (DWORD) q; } +inline DWORD ACE_High_DWORD (ACE_QWORD q) { return (DWORD) (q >> 32); } +ACE_END_VERSIONED_NAMESPACE_DECL +# endif /* _FILE_OFFSET_BITS==64 */ +#endif /* ACE_WIN32 */ + # include /**/ "ace/post.h" #endif /* ACE_OS_NS_MACROS_H */ diff --git a/ACE/ace/OS_NS_time.h b/ACE/ace/OS_NS_time.h index 3834692fc42..3ae89c72ba2 100644 --- a/ACE/ace/OS_NS_time.h +++ b/ACE/ace/OS_NS_time.h @@ -133,12 +133,7 @@ inline double ace_difftime(time_t t1, time_t t0) #endif /* !ACE_LACKS_DIFFTIME */ # if defined (ACE_WIN32) -// 64-bit quad-word definitions. -typedef unsigned __int64 ACE_QWORD; typedef unsigned __int64 ACE_hrtime_t; -inline ACE_QWORD ACE_MAKE_QWORD (DWORD lo, DWORD hi) { return ACE_QWORD (lo) | (ACE_QWORD (hi) << 32); } -inline DWORD ACE_LOW_DWORD (ACE_QWORD q) { return (DWORD) q; } -inline DWORD ACE_HIGH_DWORD (ACE_QWORD q) { return (DWORD) (q >> 32); } # elif defined (_TNS_R_TARGET) typedef long long ACE_hrtime_t; # else /* !ACE_WIN32 */ |