makedep: Use msvcrt headers for objects inside importlibs.

dlls/msvcrt/crt_main.c

@@ -24,7 +24,7 @@
 
 #ifdef __MINGW32__
 
-#include "msvcrt.h"
+#include <stdarg.h>
 
 #include "windef.h"
 #include "winbase.h"

dlls/msvcrt/crt_wmain.c

@@ -24,7 +24,7 @@
 
 #ifdef __MINGW32__
 
-#include "msvcrt.h"
+#include <stdarg.h>
 
 #include "windef.h"
 #include "winbase.h"

dlls/msvcrt/iob.c

@@ -23,15 +23,15 @@
 #pragma makedep implib
 #endif
 
-#include "msvcrt.h"
+#include <stdio.h>
 
 #undef __iob_func
-extern MSVCRT_FILE * CDECL __iob_func(void);
+extern FILE * __cdecl __iob_func(void);
 
 /*********************************************************************
  *		__acrt_iob_func(UCRTBASE.@)
  */
-MSVCRT_FILE * CDECL __acrt_iob_func(unsigned idx)
+FILE * __cdecl __acrt_iob_func(unsigned idx)
 {
     return __iob_func() + idx;
 }

dlls/msvcrt/mathf.c

@@ -23,7 +23,19 @@
 #pragma makedep implib
 #endif
 
-#include <math.h>
+#include <corecrt.h>
+
+double __cdecl sin(double);
+double __cdecl cos(double);
+double __cdecl tan(double);
+double __cdecl atan2(double, double);
+double __cdecl exp(double);
+double __cdecl log(double);
+double __cdecl pow(double, double);
+double __cdecl sqrt(double);
+double __cdecl floor(double);
+double __cdecl ceil(double);
+float __cdecl powf(float, float);
 
 #if defined(__i386__) || (_MSVCR_VER > 0 && _MSVCR_VER < 80)
 float sinf(float x) { return sin(x); }

dlls/msvcrt/onexit.c

@@ -23,6 +23,7 @@
 #pragma makedep implib
 #endif
 
+#define _CRTIMP
 #include "msvcrt.h"
 #include "mtdll.h"
 

dlls/ucrtbase/printf.c

@@ -21,6 +21,7 @@
 #pragma makedep implib
 #endif
 
+#define _CRTIMP
 #include <stdarg.h>
 #include "msvcrt.h"
 

tools/makedep.c

@@ -1628,6 +1628,7 @@ static void parse_file( struct makefile *make, struct incl_file *source, int src
     source->files_size = file->deps_count;
     source->files = xmalloc( source->files_size * sizeof(*source->files) );
     if (file->flags & FLAG_C_UNIX) source->use_msvcrt = 0;
+    else if (file->flags & FLAG_C_IMPLIB) source->use_msvcrt = 1;
 
     if (source->sourcename)
     {