msvcr100: Fix compilation on NetBSD (conflicting fenv_t definitions).

Signed-off-by: Piotr Caban <piotr@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Piotr Caban 2016-07-15 13:10:31 +02:00 committed by Alexandre Julliard
parent 88fc3a3ef5
commit d7dd5d8fe4
2 changed files with 2 additions and 2 deletions

View File

@ -1201,7 +1201,7 @@ int CDECL _controlfp_s(unsigned int *cur, unsigned int newval, unsigned int mask
/********************************************************************* /*********************************************************************
* fegetenv (MSVCR120.@) * fegetenv (MSVCR120.@)
*/ */
int CDECL MSVCRT_fegetenv(fenv_t *env) int CDECL MSVCRT_fegetenv(MSVCRT_fenv_t *env)
{ {
env->control = _controlfp(0, 0) & (MSVCRT__EM_INEXACT | MSVCRT__EM_UNDERFLOW | env->control = _controlfp(0, 0) & (MSVCRT__EM_INEXACT | MSVCRT__EM_UNDERFLOW |
MSVCRT__EM_OVERFLOW | MSVCRT__EM_ZERODIVIDE | MSVCRT__EM_INVALID); MSVCRT__EM_OVERFLOW | MSVCRT__EM_ZERODIVIDE | MSVCRT__EM_INVALID);

View File

@ -914,7 +914,7 @@ typedef struct
{ {
unsigned int control; unsigned int control;
unsigned int status; unsigned int status;
} fenv_t; } MSVCRT_fenv_t;
#define MSVCRT_CLOCKS_PER_SEC 1000 #define MSVCRT_CLOCKS_PER_SEC 1000