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

@@ -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.

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/

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
  

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    

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 );