From fbbfd76c4188bea5393e14737e732a5cb579b147 Mon Sep 17 00:00:00 2001
From: Xavi <jarabal@gmail.com>
Date: Sat, 5 Jun 2010 15:47:53 +0000
Subject: [PATCH] 2010-06-05 17:45 UTC+0200 Xavi (jarabal/at/gmail.com)   *
 contrib/hbwin/win_shell.c     + Added protection to typedef SHNAMEMAPPING,
 LPSHNAMEMAPPING for MINGW64.       MinGW-W64 provides these definitions and
 cause error when building hbwin.

---
 harbour/ChangeLog                 | 5 +++++
 harbour/contrib/hbwin/win_shell.c | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 96b78f6a5e..82e7530e6a 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,11 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2010-06-05 17:45 UTC+0200 Xavi (jarabal/at/gmail.com)
+  * contrib/hbwin/win_shell.c
+    + Added protection to typedef SHNAMEMAPPING, LPSHNAMEMAPPING for MINGW64.
+      MinGW-W64 provides these definitions and cause error when building hbwin.
+
 2010-06-05 14:25 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * config/postinst.prg
     ! Fixed to use platform native pathseps in few remaining places.
diff --git a/harbour/contrib/hbwin/win_shell.c b/harbour/contrib/hbwin/win_shell.c
index 0b11238a9b..9abc64ef61 100644
--- a/harbour/contrib/hbwin/win_shell.c
+++ b/harbour/contrib/hbwin/win_shell.c
@@ -110,7 +110,7 @@ HB_FUNC( WIN_SHELLNOTIFYICON )
 
 #if ! defined( HB_OS_WIN_CE )
 
-#if defined( __MINGW32__ )
+#if defined( __MINGW32__ ) && ! defined( __MINGW64__ )
 
 typedef struct _SHNAMEMAPPING
 {