From 16e2ab4a2ee8a49483a713cc2c09c4e0e1ce9a85 Mon Sep 17 00:00:00 2001
From: Brian Hays <bhays@abacuslaw.com>
Date: Tue, 29 Jan 2002 06:54:16 +0000
Subject: [PATCH] 2002-01-28 22:52 UTC-0800 Brian Hays <bhays@abacuslaw.com>

---
 harbour/ChangeLog                   |  8 ++++++++
 harbour/contrib/hbzlib/makefile2.bc | 18 +++++++++---------
 harbour/source/rtl/persist.prg      |  4 ++--
 3 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 336cd02801..25ed92feae 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -7,6 +7,14 @@
    For example:
    2002-12-01 23:12 UTC+0100 Foo Bar <foo.bar@foobar.org>
 */
+   * source/rtl/saverest.c
+       instructions.
+
+2002-01-29 10:00 UTC+0100 Antonio Linares <alinares@fivetech.com>
+   * source/vm/extend.c
+     + New functions hb_retcbuffer() and hb_retcconst() added
+
+   * source/vm/itemapi.c
      + New function hb_itemPutCConst() added
 
    * include/hbapi.h
diff --git a/harbour/contrib/hbzlib/makefile2.bc b/harbour/contrib/hbzlib/makefile2.bc
index 834007f769..d3e573bc07 100644
--- a/harbour/contrib/hbzlib/makefile2.bc
+++ b/harbour/contrib/hbzlib/makefile2.bc
@@ -14,9 +14,9 @@ ID = impdef
 #       I'll leave it to TASM until a better solution is found
 AS = tasm
 
-BIN_DIR = ..\..\..\bin
-OBJ_DIR = ..\..\..\obj\b32
-LIB_DIR = ..\..\..\lib\b32
+BIN_DIR = ..\..\bin
+OBJ_DIR = ..\..\obj\b32
+LIB_DIR = ..\..\lib\b32
 
 COMMON_LIB   = $(LIB_DIR)\common.lib
 DBFCDX_LIB   = $(LIB_DIR)\dbfcdx.lib
@@ -45,11 +45,11 @@ ARFLAGS = /P32
 # Directory macros. These should never have to change.
 #
 
-INCLUDE_DIR  = ..\..\..\include;.;\temp\ziparchive
+INCLUDE_DIR  = ..\..\include;.
 ZLIB_DIR     = .
 WINSYS_DIR   = \WINDOWS\SYSTEM
 CFLAGS         = -I$(INCLUDE_DIR) -d $(C_USR) $(CFLAGS)  -DWIN32
-CLIBFLAGS  = $(CFLAGS) 
+CLIBFLAGS  = $(CFLAGS)
 HARBOUR_EXE  = $(BIN_DIR)\harbour.exe
 HARBOURFLAGS   = -i$(INCLUDE_DIR) -n -q0 -w -es2  -gc0 $(PRG_USR) $(HARBOURFLAGS)
 LDFLAGS        = $(LDFLAGS)
@@ -59,7 +59,7 @@ LDFLAGS        = $(LDFLAGS)
 #
 
 ZLIB_LIB   = $(LIB_DIR)\zlib1.lib
-ZLIB_EXE   = $(ZLIB_DIR)\x\test.exe
+ZLIB_EXE   = $(ZLIB_DIR)\test.exe
 
 
 ZLIB_BOR_LIB = $(LIB_DIR)\ziparchive.lib
@@ -74,8 +74,8 @@ ZLIB_EXE_OBJS =  \
 all: \
    $(ZLIB_LIB) \
    $(ZLIB_EXE_OBJS) \
-   $(ZLIB_EXE) 
-     
+   $(ZLIB_EXE)
+
 
 $(ZLIB_LIB) = $(ZLIB_LIB_OBJS)
 
@@ -102,7 +102,7 @@ $(ZLIB_EXE) : $(ZLIB_EXE_OBJS)
    echo. $(CFLAGS)  > make.tmp
    echo. -M -e$(ZLIB_EXE) >> make.tmp
    echo. -I$(INCLUDE_DIR) >> make.tmp
-   echo. $(OBJ_DIR)\test.obj >> make.tmp 
+   echo. $(OBJ_DIR)\test.obj >> make.tmp
    echo. $(ZLIB_LIB) >> make.tmp
    echo. $(ZLIB_BOR_LIB) >> make.tmp
    echo. $(PP_LIB) >> make.tmp
diff --git a/harbour/source/rtl/persist.prg b/harbour/source/rtl/persist.prg
index 368dbfcf9d..2d0bde1d79 100644
--- a/harbour/source/rtl/persist.prg
+++ b/harbour/source/rtl/persist.prg
@@ -85,7 +85,7 @@ METHOD LoadFromText( cObjectText ) CLASS HBPersistent
    end
 
    while nLine <= nLines
-      cLine  := MemoLine( cObjectText,, nLine )
+      cLine  := MemoLine( cObjectText, 254, nLine )
 
       do case
          case Upper( LTrim( __StrToken( cLine, 1 ) ) ) == "OBJECT"
@@ -133,7 +133,7 @@ METHOD SaveToText( cObjectName ) CLASS HBPersistent
       uNewValue := __objSendMsg( oNew, aProperties[ n ] )
       cType  := ValType( uValue )
 
-      if cType == ValType( uNewValue ) .AND. ! uValue == uNewValue
+      if cType != ValType( uNewValue ) .OR. ! uValue == uNewValue
 
          do case
             case cType == "A"