* zmouse.h (HwndMSWheel): Replace WINBOOL by BOOL.
* ntdef.h, windef.h: Clean up the BOOL type definitions.


git-svn-id: svn+ssh://svn.code.sf.net/p/mingw-w64/code/trunk@3185 4407c894-4637-0410-b4f5-ada5f102cad1

mingw-w64-headers/include/ntdef.h

diff --git a/mingw-w64-headers/include/ntdef.h b/mingw-w64-headers/include/ntdef.h
index 2ecd9a3..5183e9a 100644
--- a/mingw-w64-headers/include/ntdef.h
+++ b/mingw-w64-headers/include/ntdef.h
@@ -305,11 +305,12 @@
 #pragma push_macro("BOOL")
 #undef BOOL
 #if !defined(__OBJC__) && !defined(__OBJC_BOOL) && !defined(__objc_INCLUDE_GNU)
-typedef WINBOOL BOOL;
+typedef int BOOL;
 #endif
+#define BOOL WINBOOL
+typedef BOOL *PBOOL;
+typedef BOOL *LPBOOL;
 #pragma pop_macro("BOOL")
-typedef WINBOOL *PBOOL;
-typedef WINBOOL *LPBOOL;
 #endif /* _DEF_WINBOOL_ */
 
 #ifndef _HRESULT_DEFINED

mingw-w64-headers/include/windef.h

diff --git a/mingw-w64-headers/include/windef.h b/mingw-w64-headers/include/windef.h
index b090a0b..687a5c6 100644
--- a/mingw-w64-headers/include/windef.h
+++ b/mingw-w64-headers/include/windef.h
@@ -102,13 +102,12 @@
 #pragma push_macro("BOOL")
 #undef BOOL
 #if !defined(__OBJC__) && !defined(__OBJC_BOOL) && !defined(__objc_INCLUDE_GNU)
-typedef WINBOOL BOOL;
+typedef int BOOL;
 #endif
-#pragma pop_macro("BOOL")
-#include <mingw_inc/_pushBOOL.h>
+#define BOOL WINBOOL
 typedef BOOL *PBOOL;
 typedef BOOL *LPBOOL;
-#include <minw_inc/popBOOL.h>
+#pragma pop_macro("BOOL")
 #endif /* _DEF_WINBOOL_ */
 
 typedef unsigned char BYTE;

mingw-w64-headers/include/zmouse.h

diff --git a/mingw-w64-headers/include/zmouse.h b/mingw-w64-headers/include/zmouse.h
index 4d219bf..0215662 100644
--- a/mingw-w64-headers/include/zmouse.h
+++ b/mingw-w64-headers/include/zmouse.h
@@ -39,7 +39,7 @@
   *puiMsh_MsgMouseWheel = RegisterWindowMessage(MSH_MOUSEWHEEL);
   *puiMsh_Msg3DSupport = RegisterWindowMessage(MSH_WHEELSUPPORT);
   *puiMsh_MsgScrollLines = RegisterWindowMessage(MSH_SCROLL_LINES);
-  if(*puiMsh_Msg3DSupport) *pf3DSupport = (WINBOOL)SendMessage(hdlMsWheel,*puiMsh_Msg3DSupport,0,0);
+  if(*puiMsh_Msg3DSupport) *pf3DSupport = (BOOL)SendMessage(hdlMsWheel,*puiMsh_Msg3DSupport,0,0);
   else *pf3DSupport = FALSE;
   if(*puiMsh_MsgScrollLines) *piScrollLines = (int)SendMessage(hdlMsWheel,*puiMsh_MsgScrollLines,0,0);
   else *piScrollLines = 3;