From: Nathan Moinvaziri <nathan@nathanm.com>
Date: Sun, 31 May 2020 16:51:28 +0000 (-0700)
Subject: Fixed multi-line assembly macro in UPDATE_HASH for MSVC when using ClangCl.
X-Git-Tag: 1.9.9-b1~249
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1a3d80677fa3bfce74f521c278040a2a8bfb04ad;p=thirdparty%2Fzlib-ng.git

Fixed multi-line assembly macro in UPDATE_HASH for MSVC when using ClangCl.
https://docs.microsoft.com/en-us/cpp/assembler/inline/defining-asm-blocks-as-c-macros

    insert_string_tpl.h(44,5): error : cannot use more than one symbol in memory operand
    insert_string_sse.c(28,13): message : expanded from macro 'UPDATE_HASH'
---

diff --git a/arch/x86/insert_string_sse.c b/arch/x86/insert_string_sse.c
index 5b554e9fa..d0c316b19 100644
--- a/arch/x86/insert_string_sse.c
+++ b/arch/x86/insert_string_sse.c
@@ -23,12 +23,10 @@
 #else
 #  ifdef _MSC_VER
 #    define UPDATE_HASH(s, h, val) {\
-        __asm {\
-            mov edx, h\
-            mov eax, val\
-            crc32 eax, edx\
-            mov val, eax\
-        };\
+        __asm mov edx, h\
+        __asm mov eax, val\
+        __asm crc32 eax, edx\
+        __asm mov val, eax\
     }
 #  else
 #    define UPDATE_HASH(s, h, val) \