[mapguide-commits] r10254 - in branches/4.0/MgDev/Server/src: Gws/GwsCommon/inc UnitTesting

[svn_mapguide at osgeo.org]

Author: jng
Date: 2026-11-02 20:56:16 -0800 (Mon, 02 Nov 2026)
New Revision: 10254

Modified:
   branches/4.0/MgDev/Server/src/Gws/GwsCommon/inc/GwsThreads.h
   branches/4.0/MgDev/Server/src/UnitTesting/UnitTesting.vcxproj
Log:
Fix r10251 to build on Windows

Modified: branches/4.0/MgDev/Server/src/Gws/GwsCommon/inc/GwsThreads.h
===================================================================
--- branches/4.0/MgDev/Server/src/Gws/GwsCommon/inc/GwsThreads.h	2026-11-03 04:29:35 UTC (rev 10253)
+++ branches/4.0/MgDev/Server/src/Gws/GwsCommon/inc/GwsThreads.h	2026-11-03 04:56:16 UTC (rev 10254)
@@ -22,7 +22,10 @@
 #define INVALID_HANDLE      0
 
 #ifdef _WIN32
-#include <winbase.h>
+// windows.h, not winbase.h: winbase.h is not a standalone header. It expects
+// windef.h and winnt.h to have been included first, and this header uses types
+// from both (CRITICAL_SECTION, and the HANDLE-based semaphore below).
+#include <windows.h>
 #else
 #include <semaphore.h>
 #endif

Modified: branches/4.0/MgDev/Server/src/UnitTesting/UnitTesting.vcxproj
===================================================================
--- branches/4.0/MgDev/Server/src/UnitTesting/UnitTesting.vcxproj	2026-11-03 04:29:35 UTC (rev 10253)
+++ branches/4.0/MgDev/Server/src/UnitTesting/UnitTesting.vcxproj	2026-11-03 04:56:16 UTC (rev 10254)
@@ -104,7 +104,7 @@
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>ACEd.lib;FDO.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>ACEd.lib;FDO.lib;FDOCommon.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)MgUnitTestingd.dll</OutputFile>
       <AdditionalLibraryDirectories>..\..\..\Oem\ACE\ACE_wrappers\lib\$(Configuration);..\..\..\Oem\FDO\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -130,7 +130,7 @@
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>ACEd.lib;FDO.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>ACEd.lib;FDO.lib;FDOCommon.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)MgUnitTestingd.dll</OutputFile>
       <AdditionalLibraryDirectories>..\..\..\Oem\ACE\ACE_wrappers\lib64\$(Configuration);..\..\..\Oem\FDO\lib64\$(Configuration)64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -155,7 +155,7 @@
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>ACE.lib;FDO.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>ACE.lib;FDO.lib;FDOCommon.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)MgUnitTesting.dll</OutputFile>
       <AdditionalLibraryDirectories>..\..\..\Oem\ACE\ACE_wrappers\lib\$(Configuration);..\..\..\Oem\FDO\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -182,7 +182,7 @@
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>ACE.lib;FDO.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>ACE.lib;FDO.lib;FDOCommon.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)MgUnitTesting.dll</OutputFile>
       <AdditionalLibraryDirectories>..\..\..\Oem\ACE\ACE_wrappers\lib64\$(Configuration);..\..\..\Oem\FDO\lib64\$(Configuration)64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>