From 6ea6ae633b9ea1d97fe5a2c7eabcc2de2c6be4e0 Mon Sep 17 00:00:00 2001 From: Jeremy Lorelli Date: Sat, 15 Feb 2025 13:05:02 -0800 Subject: [PATCH] Define NOCRYPT, NOSOUND and NOKANJI before including windows.h --- .../libcom/src/osi/os/WIN32/epicsAtomicOSD.h | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/modules/libcom/src/osi/os/WIN32/epicsAtomicOSD.h b/modules/libcom/src/osi/os/WIN32/epicsAtomicOSD.h index 46a4a85aa..a1221deb7 100644 --- a/modules/libcom/src/osi/os/WIN32/epicsAtomicOSD.h +++ b/modules/libcom/src/osi/os/WIN32/epicsAtomicOSD.h @@ -53,6 +53,21 @@ #undef NOGDI #define NOGDI +/* Disable crypto stuff */ +#pragma push_macro("NOCRYPT") +#undef NOCRYPT +#define NOCRYPT + +/* Disable sound driver routines */ +#pragma push_macro("NOSOUND") +#undef NOSOUND +#define NOSOUND + +/* Disable Kanji writing system support */ +#pragma push_macro("NOKANJI") +#undef NOKANJI +#define NOKANJI + #include "windows.h" /* Restore previous macro values */ @@ -63,6 +78,9 @@ #pragma pop_macro("NOIME") #pragma pop_macro("NOMCX") #pragma pop_macro("NOGDI") +#pragma pop_macro("NOCRYPT") +#pragma pop_macro("NOSOUND") +#pragma pop_macro("NOKANJI") #if defined ( _WIN64 ) # define MS_ATOMIC_64