From a5469097e72c53c3d04eef9d4fcfd163613635fb Mon Sep 17 00:00:00 2001
From: Xavi <jarabal@gmail.com>
Date: Tue, 8 Jun 2010 12:10:53 +0000
Subject: [PATCH] 2010-06-08 14:08 UTC+0200 Xavi (jarabal/at/gmail.com)   *
 contrib/gtwvg/gtwvg.h   * contrib/gtwvg/wvggui.h   *
 contrib/hbwin/win_shell.c     ! Fixed MinGW-w64 cross compiler detection with
 the recommended "official" method.       MinGW-w64 can also compile for x86,
 in this case are the same built-in macros.

---
 harbour/ChangeLog                 | 7 +++++++
 harbour/contrib/gtwvg/gtwvg.h     | 5 ++++-
 harbour/contrib/gtwvg/wvggui.h    | 5 ++++-
 harbour/contrib/hbwin/win_shell.c | 7 +++++--
 4 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 6777f5c211..4b6a7603ee 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,13 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2010-06-08 14:08 UTC+0200 Xavi (jarabal/at/gmail.com)
+  * contrib/gtwvg/gtwvg.h
+  * contrib/gtwvg/wvggui.h
+  * contrib/hbwin/win_shell.c
+    ! Fixed MinGW-w64 cross compiler detection with the recommended "official" method.
+      MinGW-w64 can also compile for x86, in this case are the same built-in macros.
+
 2010-06-08 13:17 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * src/rtl/hbregexc.c
     * Changed to not throw RTE, just gracefully return
diff --git a/harbour/contrib/gtwvg/gtwvg.h b/harbour/contrib/gtwvg/gtwvg.h
index 1130b4e22a..8d37a50999 100644
--- a/harbour/contrib/gtwvg/gtwvg.h
+++ b/harbour/contrib/gtwvg/gtwvg.h
@@ -58,7 +58,10 @@
 /*----------------------------------------------------------------------*/
 
 #ifndef _WIN32_IE
-   #ifndef __MINGW64__
+   #ifdef __MINGW32__
+      #include <_mingw.h>
+   #endif
+   #ifndef __MINGW64_VERSION_MAJOR
       #define _WIN32_IE 0x0400
    #endif
 #endif
diff --git a/harbour/contrib/gtwvg/wvggui.h b/harbour/contrib/gtwvg/wvggui.h
index 7bacae7f33..ddba418a67 100644
--- a/harbour/contrib/gtwvg/wvggui.h
+++ b/harbour/contrib/gtwvg/wvggui.h
@@ -58,7 +58,10 @@
 /*----------------------------------------------------------------------*/
 
 #ifndef _WIN32_IE
-   #ifndef __MINGW64__
+   #ifdef __MINGW32__
+      #include <_mingw.h>
+   #endif
+   #ifndef __MINGW64_VERSION_MAJOR
       #define _WIN32_IE 0x0400
    #endif
 #endif
diff --git a/harbour/contrib/hbwin/win_shell.c b/harbour/contrib/hbwin/win_shell.c
index 9abc64ef61..c944739d7a 100644
--- a/harbour/contrib/hbwin/win_shell.c
+++ b/harbour/contrib/hbwin/win_shell.c
@@ -110,7 +110,9 @@ HB_FUNC( WIN_SHELLNOTIFYICON )
 
 #if ! defined( HB_OS_WIN_CE )
 
-#if defined( __MINGW32__ ) && ! defined( __MINGW64__ )
+#if defined( __MINGW32__ )
+#  include <_mingw.h>
+#  if ! defined( __MINGW64_VERSION_MAJOR )
 
 typedef struct _SHNAMEMAPPING
 {
@@ -120,7 +122,8 @@ typedef struct _SHNAMEMAPPING
    int    cchNewPath;
 } SHNAMEMAPPING, * LPSHNAMEMAPPING;
 
-#endif
+#endif   /* End MinGW-w64 detection */
+#endif   /* End MinGW detection */
 
 typedef struct
 {