From af25b26df2e8a7963b8714f7947deaf5024961fc Mon Sep 17 00:00:00 2001
From: Eddie Runia <eddie@runia.com>
Date: Sun, 11 Jul 1999 20:31:46 +0000
Subject: [PATCH] see changelog

---
 harbour/ChangeLog             | 8 +++++---
 harbour/include/extend.h      | 6 +++---
 harbour/include/hbdefs.h      | 3 +--
 harbour/source/rtl/codebloc.c | 2 +-
 harbour/source/rtl/memvars.c  | 8 ++++----
 5 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index d8d0713873..b05389bb58 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -1,5 +1,9 @@
-19990711-20:25 Ryszard Glab <rglab@imid.med.pl>
+19990711-21:15 Eddie Runia <eddie@runia.com>
+* include/hbdefs.h; include/extend.h; source/rtl/codebloc.c;
+  source/rtl/memvars.c
+  HANDLE changed to HB_HANDLE
 
+19990711-20:25 Ryszard Glab <rglab@imid.med.pl>
 * include/init.h
  * all functions and variables declared in this file have to be 'static'
  
@@ -8,8 +12,6 @@
    symbols table initialization only when strict ANSI C compiler 
    is used. 
    
-19990711-20:25 Ryszard Glab <rglab@imid.med.pl>
-
 * include/extend.h
  + added HB_VALUE structure for storing memvars and detached locals
  + added hb_struMemvar used in HB_ITEM structure
diff --git a/harbour/include/extend.h b/harbour/include/extend.h
index 19198c07f0..22ac4420df 100644
--- a/harbour/include/extend.h
+++ b/harbour/include/extend.h
@@ -292,9 +292,9 @@ PDYNSYM  NewDynSym( PSYMBOL pSymbol ); /* creates a new dynamic symbol based on
 PDYNSYM  FindDynSym( char * szName );  /* finds a dynamic symbol */
 
 /* functions for memvar variables */
-HANDLE hb_GlobalValueNew( PHB_ITEM );
-void hb_GlobalValueIncRef( HANDLE );
-void hb_GlobalValueDecRef( HANDLE );
+HB_HANDLE hb_GlobalValueNew( PHB_ITEM );
+void hb_GlobalValueIncRef( HB_HANDLE );
+void hb_GlobalValueDecRef( HB_HANDLE );
 HB_VALUE_PTR * hb_GlobalValueBaseAddress( void );
 
 #endif /* HB_EXTEND_H_ */
diff --git a/harbour/include/hbdefs.h b/harbour/include/hbdefs.h
index d1c5b5c481..c09ea89608 100644
--- a/harbour/include/hbdefs.h
+++ b/harbour/include/hbdefs.h
@@ -43,8 +43,7 @@ typedef int BOOL;
 #undef PVOID
 typedef void * PVOID;
 
-#undef HANDLE
-typedef USHORT HANDLE;
+typedef USHORT HB_HANDLE;
 
 #define LOBYTE(w)           ((BYTE)(w))
 #define HIBYTE(w)           ((BYTE)(((WORD)(w) >> 8) & 0xFF))
diff --git a/harbour/source/rtl/codebloc.c b/harbour/source/rtl/codebloc.c
index 71cf3d9d2b..8a78dcc92b 100644
--- a/harbour/source/rtl/codebloc.c
+++ b/harbour/source/rtl/codebloc.c
@@ -76,7 +76,7 @@ HB_CODEBLOCK_PTR hb_CodeblockNew( BYTE * pBuffer,
      */
     WORD w = 0;
     PHB_ITEM pLocal;
-    HANDLE hGlobal;
+    HB_HANDLE hGlobal;
 
     /* Create a table that will store the values of local variables
      * accessed in a codeblock
diff --git a/harbour/source/rtl/memvars.c b/harbour/source/rtl/memvars.c
index 18f344b130..2664827802 100644
--- a/harbour/source/rtl/memvars.c
+++ b/harbour/source/rtl/memvars.c
@@ -80,10 +80,10 @@ HB_VALUE_PTR *hb_GlobalValueBaseAddress( void )
  *  handle to variable memory or fails
  *
 */
-HANDLE hb_GlobalValueNew( HB_ITEM_PTR pSource )
+HB_HANDLE hb_GlobalValueNew( HB_ITEM_PTR pSource )
 {
    HB_VALUE_PTR pValue;
-   HANDLE hValue;
+   HB_HANDLE hValue;
 
    if( ! _globalTable )
    {
@@ -154,7 +154,7 @@ HANDLE hb_GlobalValueNew( HB_ITEM_PTR pSource )
  * This function increases the number of references to passed global value
  *
  */
-void hb_GlobalValueIncRef( HANDLE hValue )
+void hb_GlobalValueIncRef( HB_HANDLE hValue )
 {
    #ifdef MEMVARDEBUG
    if( hValue < 0 || hValue > _globalTableSize )
@@ -176,7 +176,7 @@ void hb_GlobalValueIncRef( HANDLE hValue )
  * If it is the last reference then this value is deleted.
  *
  */
-void hb_GlobalValueDecRef( HANDLE hValue )
+void hb_GlobalValueDecRef( HB_HANDLE hValue )
 {
    HB_VALUE_PTR pValue;