From 1732c9440ab491f1a38baab87dab5284bf81da1d Mon Sep 17 00:00:00 2001 From: Dirk Zimoch Date: Fri, 14 Mar 2025 16:54:09 +0100 Subject: [PATCH] fix for mingw warning about order of header files --- modules/libcom/src/osi/os/WIN32/epicsAtomicOSD.h | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/modules/libcom/src/osi/os/WIN32/epicsAtomicOSD.h b/modules/libcom/src/osi/os/WIN32/epicsAtomicOSD.h index 6a9f4484e..6af1bc81b 100644 --- a/modules/libcom/src/osi/os/WIN32/epicsAtomicOSD.h +++ b/modules/libcom/src/osi/os/WIN32/epicsAtomicOSD.h @@ -19,6 +19,12 @@ #define EPICS_ATOMIC_OS_NAME "WIN32" +#ifdef WIN32_LEAN_AND_MEAN +# define WIN32_LEAN_AND_MEAN_DETECTED_epicsAtomicOSD_h +#else +# define WIN32_LEAN_AND_MEAN +#endif + #ifdef VC_EXTRALEAN # define VC_EXTRALEAN_DETECTED_epicsAtomicOSD_h #else @@ -33,6 +39,10 @@ #include "windows.h" +#ifndef WIN32_LEAN_AND_MEAN_DETECTED_epicsAtomicOSD_h +# undef WIN32_LEAN_AND_MEAN +#endif + #ifndef VC_EXTRALEAN_DETECTED_epicsAtomicOSD_h # undef VC_EXTRALEAN #endif