[ros-diffs] [reactos] 02/02: [MSI] Remove obsolete '__ASM_DEFINE_FUNC()'

[Serge Gautherie]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2dfcb500e2a065580c7c2…

commit 2dfcb500e2a065580c7c25a5d431d1f7710b8b41
Author:     Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr>
AuthorDate: Wed Jun 10 10:09:14 2020 +0200
Commit:     Thomas Faber <thomas.faber(a)reactos.org>
CommitDate: Sat Jun 27 14:48:00 2020 +0200

    [MSI] Remove obsolete '__ASM_DEFINE_FUNC()'
    
    MSVC build reports:
    {{
    dll\win32\msi\msvchelper.h(3): warning C4005: '__ASM_DEFINE_FUNC': macro
redefinition
    sdk\include\reactos\wine/asm.h(60): note: see previous definition of
'__ASM_DEFINE_FUNC'
    dll\win32\msi\custom.c(547): warning C4003: not enough actual parameters for macro
'__ASM_DEFINE_FUNC'
    }}
    
    Addendum to 476c99b and 9efafd6.
---
 dll/win32/msi/msi_ros.diff | 3 +--
 dll/win32/msi/msvchelper.h | 1 -
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/dll/win32/msi/msi_ros.diff b/dll/win32/msi/msi_ros.diff
index 7198d57b507..3d153bb231e 100644
--- a/dll/win32/msi/msi_ros.diff
+++ b/dll/win32/msi/msi_ros.diff
@@ -197,10 +197,9 @@ Index: D:/trunk/dll/win32/msi/msvchelper.h
 ===================================================================
 --- D:/trunk/dll/win32/msi/msvchelper.h	(revision 0)
 +++ D:/trunk/dll/win32/msi/msvchelper.h	(revision 51711)
-@@ -0,0 +1,13 @@
+@@ -0,0 +1,12 @@
 +
 +#ifdef __i386__
-+#define __ASM_DEFINE_FUNC(name,suffix,code)
 +
 +typedef unsigned int (__stdcall *__MSVC__MsiCustomActionEntryPoint)(unsigned int);
 +
diff --git a/dll/win32/msi/msvchelper.h b/dll/win32/msi/msvchelper.h
index 26a6266be69..0ad6d72308d 100644
--- a/dll/win32/msi/msvchelper.h
+++ b/dll/win32/msi/msvchelper.h
@@ -1,6 +1,5 @@
 
 #ifdef __i386__
-#define __ASM_DEFINE_FUNC(name,suffix,code)
 
 typedef unsigned int (__stdcall *__MSVC__MsiCustomActionEntryPoint)(unsigned int);