Alexandre Julliard : winecrt0: Build with msvcrt.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: d401837994a31277103042fbe091e364c2fa55ea
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=d401837994a31277103042fbe091e364c2fa55ea

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Mon Jun 17 19:18:01 2019 +0200

winecrt0: Build with msvcrt.

Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/winecrt0/Makefile.in  | 2 ++
 dlls/winecrt0/debug.c      | 2 +-
 dlls/winecrt0/delay_load.c | 6 +++---
 dlls/winecrt0/dll_entry.c  | 6 +++---
 dlls/winecrt0/drv_entry.c  | 6 +++---
 dlls/winecrt0/exe_entry.c  | 6 +++---
 dlls/winecrt0/exe_main.c   | 6 +++---
 dlls/winecrt0/exe_wentry.c | 6 +++---
 dlls/winecrt0/exe_wmain.c  | 6 +++---
 dlls/winecrt0/init.c       | 6 +++---
 10 files changed, 27 insertions(+), 25 deletions(-)

diff --git a/dlls/winecrt0/Makefile.in b/dlls/winecrt0/Makefile.in
index 79ba92f..6edbd04 100644
--- a/dlls/winecrt0/Makefile.in
+++ b/dlls/winecrt0/Makefile.in
@@ -1,5 +1,7 @@
 MODULE    = libwinecrt0.a
 
+EXTRADLLFLAGS = -mno-cygwin
+
 C_SRCS = \
 	debug.c \
 	delay_load.c \
diff --git a/dlls/winecrt0/debug.c b/dlls/winecrt0/debug.c
index f4b2573..01bfd4c 100644
--- a/dlls/winecrt0/debug.c
+++ b/dlls/winecrt0/debug.c
@@ -159,7 +159,7 @@ static const char * __cdecl fallback__wine_dbg_strdup( const char *str )
 {
     static char *list[32];
     static int pos;
-    char *ret = _strdup( str );
+    char *ret = strdup( str );
     int idx;
 
     idx = InterlockedIncrement( &pos ) % ARRAY_SIZE(list);
diff --git a/dlls/winecrt0/delay_load.c b/dlls/winecrt0/delay_load.c
index aab4079..0589b62 100644
--- a/dlls/winecrt0/delay_load.c
+++ b/dlls/winecrt0/delay_load.c
@@ -18,7 +18,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#ifndef _WIN32
+#if 0
+#pragma makedep unix
+#endif
 
 #include <stdarg.h>
 #include "windef.h"
@@ -63,5 +65,3 @@ static void free_delay_imports(void)
         if (*descr->phmod) FreeLibrary( *descr->phmod );
 }
 #endif
-
-#endif  /* _WIN32 */
diff --git a/dlls/winecrt0/dll_entry.c b/dlls/winecrt0/dll_entry.c
index 591aa07..a002d87 100644
--- a/dlls/winecrt0/dll_entry.c
+++ b/dlls/winecrt0/dll_entry.c
@@ -18,7 +18,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#ifndef _WIN32
+#if 0
+#pragma makedep unix
+#endif
 
 #include <stdarg.h>
 #include "windef.h"
@@ -45,5 +47,3 @@ BOOL WINAPI DECLSPEC_HIDDEN __wine_spec_dll_entry( HINSTANCE inst, DWORD reason,
 
     return ret;
 }
-
-#endif  /* _WIN32 */
diff --git a/dlls/winecrt0/drv_entry.c b/dlls/winecrt0/drv_entry.c
index 4750168..ee9f3b1 100644
--- a/dlls/winecrt0/drv_entry.c
+++ b/dlls/winecrt0/drv_entry.c
@@ -18,7 +18,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#ifndef _WIN32
+#if 0
+#pragma makedep unix
+#endif
 
 #include <stdarg.h>
 #include "windef.h"
@@ -37,5 +39,3 @@ NTSTATUS DECLSPEC_HIDDEN WINAPI __wine_spec_drv_entry( struct _DRIVER_OBJECT *ob
     return DriverEntry( obj, path );
     /* there is no detach routine so we can't call destructors */
 }
-
-#endif  /* _WIN32 */
diff --git a/dlls/winecrt0/exe_entry.c b/dlls/winecrt0/exe_entry.c
index 69ebb1b..13a1d89 100644
--- a/dlls/winecrt0/exe_entry.c
+++ b/dlls/winecrt0/exe_entry.c
@@ -18,7 +18,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#ifndef _WIN32
+#if 0
+#pragma makedep unix
+#endif
 
 #include <stdarg.h>
 #include "windef.h"
@@ -39,5 +41,3 @@ DWORD WINAPI DECLSPEC_HIDDEN __wine_spec_exe_entry( PEB *peb )
     if (needs_init) _fini();
     ExitProcess( ret );
 }
-
-#endif  /* _WIN32 */
diff --git a/dlls/winecrt0/exe_main.c b/dlls/winecrt0/exe_main.c
index f51deba..d966faf 100644
--- a/dlls/winecrt0/exe_main.c
+++ b/dlls/winecrt0/exe_main.c
@@ -18,7 +18,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#ifndef _WIN32
+#if 0
+#pragma makedep unix
+#endif
 
 #include <stdarg.h>
 #include "windef.h"
@@ -50,5 +52,3 @@ int __cdecl main( int argc, char *argv[] )
     if (!(info.dwFlags & STARTF_USESHOWWINDOW)) info.wShowWindow = SW_SHOWNORMAL;
     return WinMain( GetModuleHandleA(0), 0, cmdline, info.wShowWindow );
 }
-
-#endif  /* _WIN32 */
diff --git a/dlls/winecrt0/exe_wentry.c b/dlls/winecrt0/exe_wentry.c
index 83606f2..9db135e 100644
--- a/dlls/winecrt0/exe_wentry.c
+++ b/dlls/winecrt0/exe_wentry.c
@@ -18,7 +18,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#ifndef _WIN32
+#if 0
+#pragma makedep unix
+#endif
 
 #include <stdarg.h>
 #include "windef.h"
@@ -39,5 +41,3 @@ DWORD WINAPI DECLSPEC_HIDDEN __wine_spec_exe_wentry( PEB *peb )
     if (needs_init) _fini();
     ExitProcess( ret );
 }
-
-#endif  /* _WIN32 */
diff --git a/dlls/winecrt0/exe_wmain.c b/dlls/winecrt0/exe_wmain.c
index f817462..7ada198 100644
--- a/dlls/winecrt0/exe_wmain.c
+++ b/dlls/winecrt0/exe_wmain.c
@@ -18,7 +18,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#ifndef _WIN32
+#if 0
+#pragma makedep unix
+#endif
 
 #include <stdarg.h>
 #include "windef.h"
@@ -52,5 +54,3 @@ int __cdecl wmain( int argc, WCHAR *argv[] )
     if (!(info.dwFlags & STARTF_USESHOWWINDOW)) info.wShowWindow = SW_SHOWNORMAL;
     return wWinMain( GetModuleHandleW(0), 0, cmdline, info.wShowWindow );
 }
-
-#endif  /* _WIN32 */
diff --git a/dlls/winecrt0/init.c b/dlls/winecrt0/init.c
index bd9d9fc..2ffe8e5 100644
--- a/dlls/winecrt0/init.c
+++ b/dlls/winecrt0/init.c
@@ -18,7 +18,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#ifndef _WIN32
+#if 0
+#pragma makedep unix
+#endif
 
 #include <stdarg.h>
 #include "windef.h"
@@ -42,5 +44,3 @@ void DECLSPEC_HIDDEN __wine_spec_init_ctor(void)
     if (__wine_spec_init_state == NO_INIT_DONE) __wine_spec_init();
     __wine_spec_init_state = CONSTRUCTORS_DONE;
 }
-
-#endif  /* _WIN32 */