From 9607dc496be3d75d805c04011ab77c300f640cbf Mon Sep 17 00:00:00 2001
From: Petr Chornyj <myorg63@mail.ru>
Date: Sun, 2 Jan 2011 13:34:06 +0000
Subject: [PATCH]     2011-02-01 15:35 UTC+0200 Petr Chornyj (myorg63 at
 mail.ru)   * contrib/hbxdiff/3rd/libxdiff/config.h     ! Fixed libxdiff build
 with msvc and bcc (tested with bcc 6.3)   * contrib/hbxdiff/hbxdiff.c     !
 Fixed memory leak   * contrib/hbxdiff/3rd/libxdiff/xdiff.hbp     * Minor
 changes   * INSTALL     + Added libxdiff related information.

---
 harbour/ChangeLog                              | 10 ++++++++++
 harbour/INSTALL                                |  3 +++
 harbour/contrib/hbxdiff/3rd/libxdiff/config.h  |  6 +++++-
 harbour/contrib/hbxdiff/3rd/libxdiff/xdiff.hbp |  1 +
 harbour/contrib/hbxdiff/hbxdiff.c              |  2 ++
 5 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 89312e239d..02d29a6c66 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,16 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2011-02-01 15:35 UTC+0200 Petr Chornyj (myorg63 at mail.ru)
+  * contrib/hbxdiff/3rd/libxdiff/config.h
+    ! Fixed libxdiff build with msvc and bcc (tested with bcc 6.3)
+  * contrib/hbxdiff/hbxdiff.c
+    ! Fixed memory leak
+  * contrib/hbxdiff/3rd/libxdiff/xdiff.hbp
+    * Minor changes
+  * INSTALL
+    + Added libxdiff related information.
+
 2011-12-21 10:43 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
   * contrib/hbplist
     + Added new libs.
diff --git a/harbour/INSTALL b/harbour/INSTALL
index fcc8b60081..042ae48767 100644
--- a/harbour/INSTALL
+++ b/harbour/INSTALL
@@ -350,6 +350,7 @@ HARBOUR
    HB_WITH_SQLITE3=C:\sqlite3 (defaults to locally hosted version if not found)
    HB_WITH_WATT= (on MS-DOS systems)
    HB_WITH_X11= (on *nix systems)
+   HB_WITH_XDIFF=C:\libxdiff-0.23\xdiff (defaults to locally hosted version if not found)
    HB_WITH_ZLIB=C:\zlib (defaults to locally hosted version if not found)
 
    To explicitly disable any given components, use the value 'no' (without
@@ -1537,6 +1538,8 @@ HARBOUR
          http://www.bgnett.no/~giva/
       HB_WITH_ZLIB - zlib [multiplatform, free, open-source]
          http://www.zlib.net/
+      HB_WITH_XDIFF - libxdiff (file differences/patches) [multiplatform, free, open-source]
+         http://www.xmailserver.org/xdiff-lib.html
 
       Windows 95 Winsock2 [win, free, closed-source]
          Information: http://support.microsoft.com/kb/182108/EN-US/
diff --git a/harbour/contrib/hbxdiff/3rd/libxdiff/config.h b/harbour/contrib/hbxdiff/3rd/libxdiff/config.h
index 79fc365999..e25da5ab3d 100644
--- a/harbour/contrib/hbxdiff/3rd/libxdiff/config.h
+++ b/harbour/contrib/hbxdiff/3rd/libxdiff/config.h
@@ -60,7 +60,11 @@
 #define HAVE_SYS_TYPES_H 1
 
 /* Define to 1 if you have the <unistd.h> header file. */
-#if ! defined( __BORLANDC__ )
+#if defined( __BORLANDC__ ) 
+#undef HAVE_UNISTD_H
+#elif defined( _MSC_VER )
+#undef HAVE_UNISTD_H
+#else
 #define HAVE_UNISTD_H 1
 #endif
  
diff --git a/harbour/contrib/hbxdiff/3rd/libxdiff/xdiff.hbp b/harbour/contrib/hbxdiff/3rd/libxdiff/xdiff.hbp
index 8336c36037..d53691c440 100644
--- a/harbour/contrib/hbxdiff/3rd/libxdiff/xdiff.hbp
+++ b/harbour/contrib/hbxdiff/3rd/libxdiff/xdiff.hbp
@@ -36,6 +36,7 @@ xversion.c
 #
 # MAP    AUTHORS
 # MAP    COPYING
+# MAP    config.h.in         config.h
 # MAP    man/xdiff.txt       xdiff.txt
 # MAP    xdiff/xadler32.c    xadler32.c    
 # MAP    xdiff/xadler32.h    xadler32.h    
diff --git a/harbour/contrib/hbxdiff/hbxdiff.c b/harbour/contrib/hbxdiff/hbxdiff.c
index f00c251427..d52b3c8d20 100644
--- a/harbour/contrib/hbxdiff/hbxdiff.c
+++ b/harbour/contrib/hbxdiff/hbxdiff.c
@@ -99,6 +99,8 @@ static HB_GARBAGE_FUNC( hb_mmf_destructor )
       if( pStructHolder->hb_mmf->mmf )
       {
          xdl_free_mmfile( pStructHolder->hb_mmf->mmf );
+         hb_xfree( pStructHolder->hb_mmf->mmf );
+
          pStructHolder->hb_mmf->mmf = NULL;
       }
       hb_xfree( pStructHolder->hb_mmf );