From 84f39259b1a52197cd30c38ab4e5be5b8db833b0 Mon Sep 17 00:00:00 2001
From: Alexandre Julliard <julliard@winehq.org>
Date: Tue, 25 Jun 2019 08:32:37 +0200
Subject: [PATCH] user.exe: Build with msvcrt.

Signed-off-by: Alexandre Julliard <julliard@winehq.org>
---
 dlls/user.exe16/Makefile.in | 2 +-
 dlls/user.exe16/comm.c      | 9 +++------
 dlls/user.exe16/dialog.c    | 3 ---
 dlls/user.exe16/message.c   | 3 ---
 dlls/user.exe16/network.c   | 5 -----
 5 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/dlls/user.exe16/Makefile.in b/dlls/user.exe16/Makefile.in
index 5a82b7590cd..664b8e81e8e 100644
--- a/dlls/user.exe16/Makefile.in
+++ b/dlls/user.exe16/Makefile.in
@@ -1,6 +1,6 @@
 MODULE    = user.exe16
 IMPORTS   = mpr user32 gdi32
-EXTRADLLFLAGS = -m16 -Wb,--main-module,user32.dll,--heap,65520
+EXTRADLLFLAGS = -m16 -mno-cygwin -Wb,--main-module,user32.dll,--heap,65520
 
 C_SRCS = \
 	bidi.c \
diff --git a/dlls/user.exe16/comm.c b/dlls/user.exe16/comm.c
index a1715c8751d..9125c6d0f37 100644
--- a/dlls/user.exe16/comm.c
+++ b/dlls/user.exe16/comm.c
@@ -50,9 +50,6 @@
  *
  */
 
-#include "config.h"
-#include "wine/port.h"
-
 #include <stdlib.h>
 #include <stdarg.h>
 #include <stdio.h>
@@ -416,7 +413,7 @@ INT16 WINAPI BuildCommDCB16(LPCSTR device, LPDCB16 lpdcb)
 
 	TRACE("(%s), ptr %p\n", device, lpdcb);
 
-	if (_strnicmp(device,"COM",3))
+	if (strnicmp(device,"COM",3))
 		return -1;
 	port = device[3] - '0';
 
@@ -457,7 +454,7 @@ INT16 WINAPI OpenComm16(LPCSTR device,UINT16 cbInQueue,UINT16 cbOutQueue)
 	if (port-- == 0)
 		ERR("BUG ! COM0 or LPT0 don't exist !\n");
 
-	if (!_strnicmp(device,"COM",3))
+	if (!strnicmp(device,"COM",3))
         {
 		if (COM[port].handle)
 			return IE_OPEN;
@@ -508,7 +505,7 @@ INT16 WINAPI OpenComm16(LPCSTR device,UINT16 cbInQueue,UINT16 cbOutQueue)
 		}
 	}
 	else
-	if (!_strnicmp(device,"LPT",3)) {
+	if (!strnicmp(device,"LPT",3)) {
 
 		if (LPT[port].handle)
 			return IE_OPEN;
diff --git a/dlls/user.exe16/dialog.c b/dlls/user.exe16/dialog.c
index 385e859e8f0..10416384562 100644
--- a/dlls/user.exe16/dialog.c
+++ b/dlls/user.exe16/dialog.c
@@ -18,9 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "config.h"
-#include "wine/port.h"
-
 #include <stdarg.h>
 
 #include "windef.h"
diff --git a/dlls/user.exe16/message.c b/dlls/user.exe16/message.c
index dd15707e9f4..14e7a198899 100644
--- a/dlls/user.exe16/message.c
+++ b/dlls/user.exe16/message.c
@@ -18,9 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "config.h"
-#include "wine/port.h"
-
 #include <assert.h>
 #include <stdarg.h>
 #include <string.h>
diff --git a/dlls/user.exe16/network.c b/dlls/user.exe16/network.c
index 8dc31b16191..c137bb19f70 100644
--- a/dlls/user.exe16/network.c
+++ b/dlls/user.exe16/network.c
@@ -18,15 +18,10 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "config.h"
-
 #include <ctype.h>
 #include <stdarg.h>
 #include <string.h>
 #include <sys/types.h>
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif
 
 #include "windef.h"
 #include "winbase.h"