Merge pull request #614 from ldorau/Disable_warning_28251_Inconsistent_annotation_for_BitScanForward

Disable warning 28251: Inconsistent annotation for _BitScanForward

Author: lukaszstolarczuk

src/utils/utils_concurrency.h

@@ -14,6 +14,10 @@
 
 #ifdef _WIN32
 #include <windows.h>
+
+#include "utils_windows_intrin.h"
+
+#pragma intrinsic(_BitScanForward64)
 #else
 #include <pthread.h>
 

src/utils/utils_windows_intrin.h

@@ -0,0 +1,26 @@
+/*
+ *
+ * Copyright (C) 2024 Intel Corporation
+ *
+ * Under the Apache License v2.0 with LLVM Exceptions. See LICENSE.TXT.
+ * SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+ *
+ */
+
+#ifndef UMF_UTILS_WINDOWS_INTRIN_H
+#define UMF_UTILS_WINDOWS_INTRIN_H 1
+
+#ifdef _WIN32
+
+// Disable warning 28251: "inconsistent annotation for function" thrown in
+// intrin.h, as we do not want to modify this file.
+#pragma warning(push)
+#pragma warning(disable : 28251)
+
+#include <intrin.h>
+
+#pragma warning(pop)
+
+#endif /* _WIN32 */
+
+#endif /* UMF_UTILS_WINDOWS_INTRIN_H */

src/utils/utils_windows_math.c

@@ -8,19 +8,7 @@
  */
 
 #include "utils_math.h"
-
-// disable warning 28251: "inconsistent annotation for function" thrown in
-// intrin.h, as we do not want to modify this file
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable : 28251)
-#endif // _MSC_VER
-
-#include <intrin.h>
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif // _MSC_VER
+#include "utils_windows_intrin.h"
 
 #pragma intrinsic(_BitScanReverse)