disable alias tag for msvc

It appears MSVC does not handle the restrict keyword properly Signed-off-by: Kimball Thurston <kdt3rd@gmail.com>
kdt3rd · Oct 5, 2024 · 0839a4b · 0839a4b
1 parent 621f2f8
commit 0839a4b
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 6 deletions.
diff --git a/src/lib/OpenEXRCore/internal_huf.c b/src/lib/OpenEXRCore/internal_huf.c
@@ -1164,10 +1164,13 @@ FastHufDecoder_buildTables (
     return EXR_ERR_SUCCESS;
 }
 
-#ifdef __cplusplus
+#ifndef __cplusplus
+#    ifndef _MSC_VER
+#        define NO_ALIAS restrict
+#    endif
+#endif
+#ifndef NO_ALIAS
 #    define NO_ALIAS
-#else
-#    define NO_ALIAS restrict
 #endif
 
 static inline void

diff --git a/src/lib/OpenEXRCore/internal_piz.c b/src/lib/OpenEXRCore/internal_piz.c
@@ -66,10 +66,14 @@ forwardLutFromBitmap (const uint8_t* bitmap, uint16_t* lut)
     return k - 1;
 }
 
-#ifdef __cplusplus
+#ifndef __cplusplus
+// msvc does not seem to properly enable restrict in C compiling. /sigh
+#    ifndef _MSC_VER
+#        define NO_ALIAS restrict
+#    endif
+#endif
+#ifndef NO_ALIAS
 #    define NO_ALIAS
-#else
-#    define NO_ALIAS restrict
 #endif
 
 static inline uint16_t