protect isnan/isinf define on c++

epics-base · Sep 16, 2024 · 0c4907f · 0c4907f
1 parent accb99f
commit 0c4907f
Showing 1 changed file with 10 additions and 0 deletions.
diff --git a/modules/libcom/src/osi/os/WIN32/epicsMath.h b/modules/libcom/src/osi/os/WIN32/epicsMath.h
@@ -19,6 +19,14 @@
 #define finite(D) _finite(D)
 #endif
 
+#ifndef __cplusplus
+
+/* these are macros in C but inline functions in C++
+ * so ifndef does not work as a check in c++
+ * and in a recent VS2022 update causes a conflict and
+ * compile time error
+ */
+
 #ifndef isnan
 #define isnan(D) _isnan(D)
 #endif
@@ -27,6 +35,8 @@
 #define isinf(D) ( !_finite(D) && !_isnan(D) )
 #endif
 
+#endif /* ifndef __cplusplus */
+
 #ifdef __cplusplus
 extern "C" {
 #endif