epics/pcas
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

GNU compile rrequires LL suffix on constants, borland requires no suffix

Browse Source
This commit is contained in:
Jeff Hill
2005-11-18 00:14:40 +00:00
parent 8230f4b189
commit d53b80a61a
1 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/libCom/osi/os/WIN32/osdTime.cpp
View File

@@ -45,12 +45,21 @@
# define debugPrintf(argsInParen)
#endif
// for mingw
#if !defined ( MAXLONGLONG )
#define MAXLONGLONG 0x7fffffffffffffffLL
// GNU seems to require that 64 bit constants have LL on
// them. The borland compiler fails to compile constants
// with the LL suffix. MS compiler doesnt care.
#ifdef __GNUC__
#define LL_CONSTANT(VAL) VAL ## LL
#else
#define LL_CONSTANT(VAL) VAL
#endif
static const LONGLONG epicsEpochInFileTime = 0x01b41e2a18d64000LL;
// for mingw
#if !defined ( MAXLONGLONG )
#define MAXLONGLONG LL_CONSTANT(0x7fffffffffffffff)
#endif
static const LONGLONG epicsEpochInFileTime = LL_CONSTANT(0x01b41e2a18d64000);
class currentTime : public epicsTimerNotify {
public:
@@ -140,7 +149,7 @@ extern "C" epicsShareFunc int epicsShareAPI epicsTimeGetEvent
inline void UnixTimeToFileTime ( const time_t * pAnsiTime, LPFILETIME pft )
{
LONGLONG ll = Int32x32To64 ( *pAnsiTime, 10000000 ) + 116444736000000000LL;
LONGLONG ll = Int32x32To64 ( *pAnsiTime, 10000000 ) + LL_CONSTANT(116444736000000000);
pft->dwLowDateTime = static_cast < DWORD > ( ll );
pft->dwHighDateTime = static_cast < DWORD > ( ll >>32 );
}