misc src updates

FirebirdSQL · Nov 19, 2024 · 377d035 · 377d035
1 parent 8243e31
commit 377d035
Show file tree

Hide file tree

Showing 15 changed files with 715 additions and 16 deletions.
diff --git a/src/common/classes/FpeControl.h b/src/common/classes/FpeControl.h
@@ -30,7 +30,7 @@
 #define CLASSES_FPE_CONTROL_H
 
 #include <math.h>
-#if defined(WIN_NT)
+#if defined(_MSC_VER)
 #include <float.h>
 #else
 #include <fenv.h>
@@ -78,7 +78,7 @@ class FpeControl
 		}
 	}
 
-#if defined(WIN_NT)
+#if defined(_MSC_VER)
 	static void maskAll() noexcept
 	{
 		_clearfp(); // always call _clearfp() before setting control word
@@ -215,7 +215,7 @@ class FpeControl
 
 inline bool isNegativeInf(double x)
 {
-#ifdef WIN_NT
+#ifdef _MSC_VER
 	return _fpclass(x) == _FPCLASS_NINF;
 #else
 	return x == -INFINITY;

diff --git a/src/common/isc_sync.cpp b/src/common/isc_sync.cpp
@@ -1847,7 +1847,11 @@ SharedMemoryBase::SharedMemoryBase(const TEXT* filename, ULONG length, IpcObject
 	}
 
 	PathName mappedName;
+#ifdef MINGW
+	if (!getMappedFileName(address, mappedName))
+#else
 	if (!getMappedFileName(address, mappedName) || mappedName != expanded_filename)
+#endif
 	{
 		UnmapViewOfFile(address);
 		CloseHandle(file_obj);
@@ -2096,7 +2100,7 @@ static const int DEFAULT_INTERLOCKED_SPIN_COUNT_SMP	= 200;
 
 static SLONG pid = 0;
 
-typedef WINBASEAPI BOOL (WINAPI *pfnSwitchToThread) ();
+typedef BOOL (WINAPI *pfnSwitchToThread) ();
 static inline BOOL switchToThread()
 {
 	static pfnSwitchToThread fnSwitchToThread = NULL;