From 0477819e8a201ce66a48b32d7ec92191812c74c0 Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Fri, 14 Apr 2000 01:06:14 +0000
Subject: [PATCH] 20000414-03:08 GMT+1 Victor Szakats <info@szelvesz.hu>

---
 harbour/ChangeLog       | 7 +++++++
 harbour/source/vm/hvm.c | 8 +++++---
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index a3f92287cb..f2c51280d8 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -1,7 +1,14 @@
+20000414-03:08 GMT+1 Victor Szakats <info@szelvesz.hu>
+
+   * source/vm/hvm.c
+     ! Changed to the standard way of including windows.h
+       (this is also a blind try to make it compile with BCC50/Win32)
+
 20000413-21:38 GMT-3 Luiz Rafael Culik <culik@sl.conex.net>
     *utils/hbdoc/hbdoc.prg
      utils/hbdoc/html.prg
         *Small changes
+
 20000413-16:40 GMT+2 Chen Kedem <niki@actcom.co.il>
    * doc/en/dbstrux.txt
      * in __FLTEDIT() HARBOUR_STRICT_CLIPPER_COMPATIBILITY was changed into
diff --git a/harbour/source/vm/hvm.c b/harbour/source/vm/hvm.c
index 7a53a0d104..ae6f440d93 100644
--- a/harbour/source/vm/hvm.c
+++ b/harbour/source/vm/hvm.c
@@ -49,6 +49,11 @@
  *
  */
 
+/* NOTE: Temporary name [vszakats] */
+#ifdef HB_INCLUDE_WINEXCHANDLER
+   #define HB_OS_WIN_32_USED
+#endif
+
 #ifndef __MPW__
    #include <malloc.h>
 #endif
@@ -3929,11 +3934,8 @@ HB_FUNC( __VMVARSGET )
                   hb_stack.iStatics + hb_parni( 1 ) - 1 );
 }
 
-/* NOTE: Temporary name [vszakats] */
 #ifdef HB_INCLUDE_WINEXCHANDLER
 
-#include <windows.h>
-
 WINBASEAPI LONG WINAPI UnhandledExceptionFilter( struct _EXCEPTION_POINTERS * ExceptionInfo )
 {
    PHB_ITEM pBase = hb_stack.pBase;