From a8732ce6383b61f1608d9385e45bd0e4c9468f7c Mon Sep 17 00:00:00 2001
From: Alexandre Julliard <julliard@winehq.org>
Date: Thu, 13 Jun 2019 08:45:28 +0200
Subject: [PATCH] mspatcha: Build with msvcrt.

Signed-off-by: Alexandre Julliard <julliard@winehq.org>
---
 dlls/mspatcha/Makefile.in     | 2 ++
 dlls/mspatcha/lzxd_dec.c      | 2 --
 dlls/mspatcha/mspatcha_main.c | 2 --
 dlls/mspatcha/pa19.c          | 8 +++-----
 4 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/dlls/mspatcha/Makefile.in b/dlls/mspatcha/Makefile.in
index 935e645abea..a380f3f1a47 100644
--- a/dlls/mspatcha/Makefile.in
+++ b/dlls/mspatcha/Makefile.in
@@ -1,6 +1,8 @@
 MODULE    = mspatcha.dll
 IMPORTLIB = mspatcha
 
+EXTRADLLFLAGS = -mno-cygwin
+
 C_SRCS = \
 	lzxd_dec.c \
 	mspatcha_main.c \
diff --git a/dlls/mspatcha/lzxd_dec.c b/dlls/mspatcha/lzxd_dec.c
index 0be5553fec6..f21e1ede9a1 100644
--- a/dlls/mspatcha/lzxd_dec.c
+++ b/dlls/mspatcha/lzxd_dec.c
@@ -21,8 +21,6 @@
  * - Implememnt interleaved decoding
  */
 
-#include "config.h"
-
 #include <stdarg.h>
 #include <assert.h>
 
diff --git a/dlls/mspatcha/mspatcha_main.c b/dlls/mspatcha/mspatcha_main.c
index 9695a7afb81..167c3fda9bb 100644
--- a/dlls/mspatcha/mspatcha_main.c
+++ b/dlls/mspatcha/mspatcha_main.c
@@ -29,8 +29,6 @@
  *    solution to the above 32-bit exe problem.
  */
 
-#include "config.h"
-
 #include <stdarg.h>
 
 #include "windef.h"
diff --git a/dlls/mspatcha/pa19.c b/dlls/mspatcha/pa19.c
index 3a0fd55cf26..633915eec37 100644
--- a/dlls/mspatcha/pa19.c
+++ b/dlls/mspatcha/pa19.c
@@ -32,8 +32,6 @@
  *   but not all, of the positions listed in the PE .reloc table.
  */
 
-#include "config.h"
-
 #include <stdarg.h>
 #include <stdlib.h>
 
@@ -297,7 +295,7 @@ static INT64 read_svli(struct patch_file_header *ph)
     return n;
 }
 
-static int compare_ignored_range(const void *a, const void *b)
+static int __cdecl compare_ignored_range(const void *a, const void *b)
 {
     LONG delta = ((PATCH_IGNORE_RANGE*)a)->OffsetInOldFile - ((PATCH_IGNORE_RANGE*)b)->OffsetInOldFile;
     if (delta > 0)
@@ -307,7 +305,7 @@ static int compare_ignored_range(const void *a, const void *b)
     return 0;
 }
 
-static int compare_retained_range_old(const void *a, const void *b)
+static int __cdecl compare_retained_range_old(const void *a, const void *b)
 {
     LONG delta = ((PATCH_RETAIN_RANGE*)a)->OffsetInOldFile - ((PATCH_RETAIN_RANGE*)b)->OffsetInOldFile;
     if (delta > 0)
@@ -317,7 +315,7 @@ static int compare_retained_range_old(const void *a, const void *b)
     return 0;
 }
 
-static int compare_retained_range_new(const void *a, const void *b)
+static int __cdecl compare_retained_range_new(const void *a, const void *b)
 {
     LONG delta = ((PATCH_RETAIN_RANGE*)a)->OffsetInNewFile - ((PATCH_RETAIN_RANGE*)b)->OffsetInNewFile;
     if (delta > 0)