From fc5d3c9a5c41bccc454a0227fbcf76bdc84e4055 Mon Sep 17 00:00:00 2001
From: JJL772 <jeremy.lorelli.1337@gmail.com>
Date: Thu, 13 Jun 2024 16:37:43 -0400
Subject: [PATCH] Disable extraneous WIN32 declarations when including
 windows.h in epicsAtomicOSD.h

---
 .../libcom/src/osi/os/WIN32/epicsAtomicOSD.h  | 57 +++++++++++++------
 1 file changed, 40 insertions(+), 17 deletions(-)

diff --git a/modules/libcom/src/osi/os/WIN32/epicsAtomicOSD.h b/modules/libcom/src/osi/os/WIN32/epicsAtomicOSD.h
index 6a9f4484e..46a4a85aa 100644
--- a/modules/libcom/src/osi/os/WIN32/epicsAtomicOSD.h
+++ b/modules/libcom/src/osi/os/WIN32/epicsAtomicOSD.h
@@ -19,27 +19,50 @@
 
 #define EPICS_ATOMIC_OS_NAME "WIN32"
 
-#ifdef VC_EXTRALEAN
-#   define VC_EXTRALEAN_DETECTED_epicsAtomicOSD_h
-#else
-#   define VC_EXTRALEAN
-#endif
+/* Disable extra declarations that we don't need here (i.e. winsock1, rpc, etc.) */
+#pragma push_macro("WIN32_LEAN_AND_MEAN")
+#undef WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN
 
-#ifdef STRICT
-#   define STRICT_DETECTED_epicsAtomicOSD_h
-#else
-#   define STRICT
-#endif
+#pragma push_macro("STRICT")
+#undef STRICT
+#define STRICT
+
+/* Disable min/max macros from windows.h. These macros can cause issues with headers such as <algorithm> that declare or use std::min/max */
+#pragma push_macro("NOMINMAX")
+#undef NOMINMAX
+#define NOMINMAX
+
+/* Disable 'service controller' includes */
+#pragma push_macro("NOSERVICE")
+#undef NOSERVICE
+#define NOSERVICE
+
+/* Disable 'input management engine' includes */
+#pragma push_macro("NOIME")
+#undef NOIME
+#define NOIME
+
+/* Disable 'modem configuration extensions' includes */
+#pragma push_macro("NOMCX")
+#undef NOMCX
+#define NOMCX
+
+/* Disable GDI includes */
+#pragma push_macro("NOGDI")
+#undef NOGDI
+#define NOGDI
 
 #include "windows.h"
 
-#ifndef VC_EXTRALEAN_DETECTED_epicsAtomicOSD_h
-#   undef VC_EXTRALEAN
-#endif
-
-#ifndef STRICT_DETECTED_epicsAtomicOSD_h
-#   undef STRICT
-#endif
+/* Restore previous macro values */
+#pragma pop_macro("WIN32_LEAN_AND_MEAN")
+#pragma pop_macro("STRICT")
+#pragma pop_macro("NOMINMAX")
+#pragma pop_macro("NOSERVICE")
+#pragma pop_macro("NOIME")
+#pragma pop_macro("NOMCX")
+#pragma pop_macro("NOGDI")
 
 #if defined ( _WIN64 )
 #    define MS_ATOMIC_64