Skip to content

Commit 377d035

Browse files
committed
misc src updates
1 parent 8243e31 commit 377d035

File tree

15 files changed

+715
-16
lines changed

15 files changed

+715
-16
lines changed

src/common/classes/FpeControl.h

+3-3
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

+5-1
Original file line numberDiff line numberDiff line change
@@ -1847,7 +1847,11 @@ SharedMemoryBase::SharedMemoryBase(const TEXT* filename, ULONG length, IpcObject
18471847
}
18481848

18491849
PathName mappedName;
1850+
#ifdef MINGW
1851+
if (!getMappedFileName(address, mappedName))
1852+
#else
18501853
if (!getMappedFileName(address, mappedName) || mappedName != expanded_filename)
1854+
#endif
18511855
{
18521856
UnmapViewOfFile(address);
18531857
CloseHandle(file_obj);
@@ -2096,7 +2100,7 @@ static const int DEFAULT_INTERLOCKED_SPIN_COUNT_SMP = 200;
20962100

20972101
static SLONG pid = 0;
20982102

2099-
typedef WINBASEAPI BOOL (WINAPI *pfnSwitchToThread) ();
2103+
typedef BOOL (WINAPI *pfnSwitchToThread) ();
21002104
static inline BOOL switchToThread()
21012105
{
21022106
static pfnSwitchToThread fnSwitchToThread = NULL;

0 commit comments

Comments
 (0)