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

[Alexandre Julliard]

Module: wine
Branch: master
Commit: d7dd5d8fe4aabc17a80600151ee7b23c90e1221d
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=d7dd5d8fe4aabc17a80600151e...

Author: Piotr Caban 
Date:   Fri Jul 15 13:10:31 2016 +0200

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

Signed-off-by: Piotr Caban 
Signed-off-by: Alexandre Julliard

---

dlls/msvcrt/math.c   | 2 +-
 dlls/msvcrt/msvcrt.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c
index e9d594c..cf33f01 100644
--- a/dlls/msvcrt/math.c
+++ b/dlls/msvcrt/math.c
@@ -1201,7 +1201,7 @@ int CDECL _controlfp_s(unsigned int *cur, unsigned int newval, unsigned int mask
 /*********************************************************************
  *		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 |
             MSVCRT__EM_OVERFLOW | MSVCRT__EM_ZERODIVIDE | MSVCRT__EM_INVALID);
diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h
index 958ca4e..e744ef0 100644
--- a/dlls/msvcrt/msvcrt.h
+++ b/dlls/msvcrt/msvcrt.h
@@ -914,7 +914,7 @@ typedef struct
 {
     unsigned int control;
     unsigned int status;
-} fenv_t;
+} MSVCRT_fenv_t;

#define MSVCRT_CLOCKS_PER_SEC 1000