ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

makedep: Use msvcrt headers for objects inside importlibs. 

Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Jacek Caban 2020-02-12 15:55:31 +01:00 committed by Alexandre Julliard
parent ba07e25ccf
commit 0d537c854c
7 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/msvcrt/crt_main.c
View File

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

2
dlls/msvcrt/crt_wmain.c
View File

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

6
dlls/msvcrt/iob.c
View File

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

14
dlls/msvcrt/mathf.c
View File

@ -23,7 +23,19 @@
#pragma makedep implib #pragma makedep implib
#endif #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) #if defined(__i386__) || (_MSVCR_VER > 0 && _MSVCR_VER < 80)
float sinf(float x) { return sin(x); } float sinf(float x) { return sin(x); }

1
dlls/msvcrt/onexit.c
View File

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

1
dlls/ucrtbase/printf.c
View File

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

1
tools/makedep.c
View File

@ -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_size = file->deps_count;
source->files = xmalloc( source->files_size * sizeof(*source->files) ); source->files = xmalloc( source->files_size * sizeof(*source->files) );
if (file->flags & FLAG_C_UNIX) source->use_msvcrt = 0; if (file->flags & FLAG_C_UNIX) source->use_msvcrt = 0;
else if (file->flags & FLAG_C_IMPLIB) source->use_msvcrt = 1;
if (source->sourcename) if (source->sourcename)
{ {