Skip to content

Commit 540452a

Browse files
committed
misc src updates
1 parent c5e37e9 commit 540452a

File tree

16 files changed

+716
-17
lines changed

16 files changed

+716
-17
lines changed

src/common/classes/FpeControl.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
#define CLASSES_FPE_CONTROL_H
3131

3232
#include <math.h>
33-
#if defined(WIN_NT)
33+
#if defined(_MSC_VER)
3434
#include <float.h>
3535
#else
3636
#include <fenv.h>
@@ -78,7 +78,7 @@ class FpeControl
7878
}
7979
}
8080

81-
#if defined(WIN_NT)
81+
#if defined(_MSC_VER)
8282
static void maskAll() noexcept
8383
{
8484
_clearfp(); // always call _clearfp() before setting control word
@@ -215,7 +215,7 @@ class FpeControl
215215

216216
inline bool isNegativeInf(double x)
217217
{
218-
#ifdef WIN_NT
218+
#ifdef _MSC_VER
219219
return _fpclass(x) == _FPCLASS_NINF;
220220
#else
221221
return x == -INFINITY;

src/common/isc_sync.cpp

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1854,7 +1854,11 @@ SharedMemoryBase::SharedMemoryBase(const TEXT* filename, ULONG length, IpcObject
18541854
}
18551855

18561856
PathName mappedName;
1857+
#ifdef MINGW
1858+
if (!getMappedFileName(address, mappedName))
1859+
#else
18571860
if (!getMappedFileName(address, mappedName) || mappedName != expanded_filename)
1861+
#endif
18581862
{
18591863
UnmapViewOfFile(address);
18601864
CloseHandle(file_obj);
@@ -2103,7 +2107,7 @@ static constexpr int DEFAULT_INTERLOCKED_SPIN_COUNT_SMP = 200;
21032107

21042108
static SLONG pid = 0;
21052109

2106-
typedef WINBASEAPI BOOL (WINAPI *pfnSwitchToThread) ();
2110+
typedef BOOL (WINAPI *pfnSwitchToThread) ();
21072111
static inline BOOL switchToThread()
21082112
{
21092113
static pfnSwitchToThread fnSwitchToThread = NULL;

0 commit comments

Comments
 (0)