From ab0e53cbe19be82dae61d112c4465a4b8477b563 Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Thu, 22 Apr 2010 16:30:14 +0000
Subject: [PATCH] 2010-04-22 18:29 UTC+0200 Viktor Szakats (harbour.01
 syenar.hu)   * contrib/gtwvg/Makefile   * contrib/hbwin/Makefile     +
 Enabled WIN32_LEAN_AND_MEAN mode.

  * contrib/hbwin/wapi_wingdi.c
  * contrib/hbwin/wapi_shellapi.c
  * contrib/hbwin/win_shell.c
    ! Fixed to build in WIN32_LEAN_AND_MEAN mode.
---
 harbour/ChangeLog                     | 10 ++++++++++
 harbour/contrib/gtwvg/Makefile        |  3 +++
 harbour/contrib/hbwin/Makefile        |  3 +++
 harbour/contrib/hbwin/wapi_shellapi.c |  2 ++
 harbour/contrib/hbwin/wapi_wingdi.c   |  2 ++
 harbour/contrib/hbwin/win_shell.c     |  2 ++
 6 files changed, 22 insertions(+)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 8a5d51f733..52a9e67635 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,16 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2010-04-22 18:29 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * contrib/gtwvg/Makefile
+  * contrib/hbwin/Makefile
+    + Enabled WIN32_LEAN_AND_MEAN mode.
+
+  * contrib/hbwin/wapi_wingdi.c
+  * contrib/hbwin/wapi_shellapi.c
+  * contrib/hbwin/win_shell.c
+    ! Fixed to build in WIN32_LEAN_AND_MEAN mode.
+
 2010-04-22 18:12 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * INSTALL
     + Added information for CUPS.
diff --git a/harbour/contrib/gtwvg/Makefile b/harbour/contrib/gtwvg/Makefile
index 39129eeefd..eb26ef20b9 100644
--- a/harbour/contrib/gtwvg/Makefile
+++ b/harbour/contrib/gtwvg/Makefile
@@ -56,6 +56,9 @@ ifeq ($(HB_PLATFORM),win)
 
    HB_INC_DEPEND := -I$(TOP)$(ROOT)contrib/hbwin
 
+   # Optimize build time and make sure we build even with this option
+   HB_CFLAGS += -DWIN32_LEAN_AND_MEAN
+
    include $(TOP)$(ROOT)config/header.mk
    include $(TOP)$(ROOT)config/lib.mk
 else
diff --git a/harbour/contrib/hbwin/Makefile b/harbour/contrib/hbwin/Makefile
index bb08577c5b..4f541bbc84 100644
--- a/harbour/contrib/hbwin/Makefile
+++ b/harbour/contrib/hbwin/Makefile
@@ -83,6 +83,9 @@ ifneq ($(filter $(HB_PLATFORM),win wce),)
       endif
    endif
 
+   # Optimize build time and make sure we build even with this option
+   HB_CFLAGS += -DWIN32_LEAN_AND_MEAN
+
    include $(TOP)$(ROOT)config/header.mk
    include $(TOP)$(ROOT)config/lib.mk
 else
diff --git a/harbour/contrib/hbwin/wapi_shellapi.c b/harbour/contrib/hbwin/wapi_shellapi.c
index 5d03493f1f..6184f8c808 100644
--- a/harbour/contrib/hbwin/wapi_shellapi.c
+++ b/harbour/contrib/hbwin/wapi_shellapi.c
@@ -55,6 +55,8 @@
    #include "hbwince.h"
 #endif
 
+#include <shellapi.h>
+
 HB_FUNC( WAPI_SHELLEXECUTE )
 {
 #if defined( HB_OS_WIN_CE )
diff --git a/harbour/contrib/hbwin/wapi_wingdi.c b/harbour/contrib/hbwin/wapi_wingdi.c
index 099928b468..f7c9c69e66 100644
--- a/harbour/contrib/hbwin/wapi_wingdi.c
+++ b/harbour/contrib/hbwin/wapi_wingdi.c
@@ -63,6 +63,8 @@
    #include "hbwince.h"
 #endif
 
+#include <winspool.h>
+
 static void s_hb_hashSetCItemNL( PHB_ITEM pHash, const char * pszKey, long v )
 {
    PHB_ITEM pKey = hb_itemPutC( NULL, pszKey );
diff --git a/harbour/contrib/hbwin/win_shell.c b/harbour/contrib/hbwin/win_shell.c
index 49e122bbb4..882a265ff1 100644
--- a/harbour/contrib/hbwin/win_shell.c
+++ b/harbour/contrib/hbwin/win_shell.c
@@ -62,6 +62,8 @@
 
 #include "hbwapi.h"
 
+#include <shellapi.h>
+
 /* WIN_ShellNotifyIcon( [<hWnd>], [<nUID>], [<nMessage>], [<hIcon>],
                         [<cTooltip>], [<lAddDel>],
                         [<cInfo>], [<nInfoTimeOut>], [<cInfoTitle>], [<nInfoFlags>] ) -> <lOK> */