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 15:47:53 +00:00
parent 0338672fa7
commit fbbfd76c41
2 changed files with 6 additions and 1 deletions
--- 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.
--- 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
 {