From 140eb39f31eb15dbe630318bbe8ef9e61e6d483c Mon Sep 17 00:00:00 2001
From: Martin Vogel <vogel@inttec.de>
Date: Tue, 24 Jul 2001 09:10:40 +0000
Subject: [PATCH] *** empty log message ***

---
 harbour/ChangeLog               | 13 +++++++++++++
 harbour/contrib/libct/justify.c |  2 +-
 harbour/contrib/libct/pos1.c    |  4 ++--
 harbour/include/hbdefs.h        | 16 ++++++++--------
 harbour/include/hbvmpub.h       |  2 +-
 5 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 18015d3372..89b614ba45 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -1,3 +1,16 @@
+2001-07-24 11:10 MEST Martin Vogel <vogel@inttec.de>
+   * include/hbdefs.h
+     * added parenthesis around HB_MKLONG and HB_MKULONG definitions to avoid warning
+       in gcc
+   * include/hbvmpub.h
+     * added newline at end of file (my gcc brought a warning)
+
+   * contrib/libct/justify.c
+     * removed unused variable
+
+   * contrib/libct/pos.1
+     * fixed error and warning about mixture of pointers to signed and unsigned char
+	
 2001-07-23 20:50 UTC-0800 Ron Pinkas <ron@profit-master.com>
    * source/vm/macro.c
      ! Corrected a compiler warning.
diff --git a/harbour/contrib/libct/justify.c b/harbour/contrib/libct/justify.c
index 88eaba8ec4..1db169b225 100644
--- a/harbour/contrib/libct/justify.c
+++ b/harbour/contrib/libct/justify.c
@@ -75,7 +75,7 @@ static void do_justify (int iSwitch)
     size_t sStrLen = hb_parclen (1);
     char cJustChar;
     char *pc, *pcRet;
-    size_t sJustOffset, sCnt;
+    size_t sJustOffset;
 
     if (hb_parclen (2) > 0)
       cJustChar = *(hb_parc (2));
diff --git a/harbour/contrib/libct/pos1.c b/harbour/contrib/libct/pos1.c
index d6b308d3bc..360dee7c81 100644
--- a/harbour/contrib/libct/pos1.c
+++ b/harbour/contrib/libct/pos1.c
@@ -84,7 +84,7 @@ static void do_pos1 (int iSwitch)
      )
   {
 
-    char *pcString;
+    unsigned char *pcString;
     size_t sStrLen;
     unsigned char *puc, ucChar1, ucChar2;
     int iMode;
@@ -117,7 +117,7 @@ static void do_pos1 (int iSwitch)
       iParamShift += 2;
     }
 
-    pcString = hb_parc (iParamShift+1);
+    pcString = (unsigned char *)hb_parc (iParamShift+1);
     sStrLen = (size_t)hb_parclen (iParamShift+1);
 
     if (ISLOG (iParamShift+2))
diff --git a/harbour/include/hbdefs.h b/harbour/include/hbdefs.h
index 109a4959db..58c4faadf8 100644
--- a/harbour/include/hbdefs.h
+++ b/harbour/include/hbdefs.h
@@ -152,14 +152,14 @@
 #define HB_HIBYTE( w )          ( ( BYTE ) ( ( ( USHORT ) ( w ) >> 8 ) & 0xFF ) )
 #define HB_MKSHORT( lo, hi )    ( ( SHORT ) ( ( ( SHORT ) ( hi ) ) << 8 ) | ( lo ) )
 #define HB_MKUSHORT( lo, hi )   ( ( USHORT ) ( ( ( USHORT ) ( hi ) ) << 8 ) | ( lo ) )
-#define HB_MKLONG( b1, b2, b3, b4 )  ( ( ( LONG ) ( b4 ) ) << 24 ) | \
-                                     ( ( ( LONG ) ( b3 ) ) << 16 ) | \
-                                     ( ( ( LONG ) ( b2 ) ) <<  8 ) | \
-                                     ( ( ( LONG ) ( b1 ) ) )
-#define HB_MKULONG( b1, b2, b3, b4 ) ( ( ( ULONG ) ( b4 ) ) << 24 ) | \
-                                     ( ( ( ULONG ) ( b3 ) ) << 16 ) | \
-                                     ( ( ( ULONG ) ( b2 ) ) <<  8 ) | \
-                                     ( ( ( ULONG ) ( b1 ) ) )
+#define HB_MKLONG( b1, b2, b3, b4 )  ( ( ( ( LONG ) ( b4 ) ) << 24 ) | \
+                                       ( ( ( LONG ) ( b3 ) ) << 16 ) | \
+                                       ( ( ( LONG ) ( b2 ) ) <<  8 ) | \
+                                       ( ( ( LONG ) ( b1 ) ) ) )
+#define HB_MKULONG( b1, b2, b3, b4 ) ( ( ( ( ULONG ) ( b4 ) ) << 24 ) | \
+                                       ( ( ( ULONG ) ( b3 ) ) << 16 ) | \
+                                       ( ( ( ULONG ) ( b2 ) ) <<  8 ) | \
+                                       ( ( ( ULONG ) ( b1 ) ) ) )
 
 #define HB_SYMBOL_UNUSED( symbol ) ( void ) symbol
 
diff --git a/harbour/include/hbvmpub.h b/harbour/include/hbvmpub.h
index f2df918194..5a1c3790f5 100644
--- a/harbour/include/hbvmpub.h
+++ b/harbour/include/hbvmpub.h
@@ -107,4 +107,4 @@ extern void hb_vmExecute( const BYTE * pCode, PHB_SYMB pSymbols );  /* invokes t
 }
 #endif
 
-#endif /* HB_VMPUB_H_ */
\ No newline at end of file
+#endif /* HB_VMPUB_H_ */