From ce594e2aa4b835b0c5b1881e33b90add278f8e47 Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Sun, 11 Apr 2010 11:35:38 +0000
Subject: [PATCH] 2010-04-11 13:35 UTC+0200 Viktor Szakats (harbour.01
 syenar.hu)   * contrib/hbmzip/minizip.dif   * contrib/hbmzip/ioapi.h     +
 Enabled 64-bit file operations for open watcom 1.9.     ! Fixed typo in prev
 commit regarding watcom.

---
 harbour/ChangeLog                  | 6 ++++++
 harbour/contrib/hbmzip/ioapi.h     | 2 +-
 harbour/contrib/hbmzip/minizip.dif | 8 +++++---
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 94c959a404..fe9f17fb0d 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,12 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2010-04-11 13:35 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * contrib/hbmzip/minizip.dif
+  * contrib/hbmzip/ioapi.h
+    + Enabled 64-bit file operations for open watcom 1.9.
+    ! Fixed typo in prev commit regarding watcom.
+
 2010-04-11 13:23 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * package/winuni/RELNOTES
     * Preparing for Open Watcom 1.9 and MSVS 2010 / WSDK 7.1.
diff --git a/harbour/contrib/hbmzip/ioapi.h b/harbour/contrib/hbmzip/ioapi.h
index 4e0af48738..2420ece737 100644
--- a/harbour/contrib/hbmzip/ioapi.h
+++ b/harbour/contrib/hbmzip/ioapi.h
@@ -45,7 +45,7 @@
 #include "zlib.h"
 
 #if defined( __BORLANDC__ ) || \
-    defined( __WATCOM__ ) || \
+    ( defined( __WATCOMC__ ) && __WATCOMC__ < 1290 ) || \
     defined( __MINGW32CE__ )
 #  define USE_FILE32API
 #endif
diff --git a/harbour/contrib/hbmzip/minizip.dif b/harbour/contrib/hbmzip/minizip.dif
index bae9561361..72db8fe461 100644
--- a/harbour/contrib/hbmzip/minizip.dif
+++ b/harbour/contrib/hbmzip/minizip.dif
@@ -145,12 +145,14 @@ diff -u ori\ioapi.c .\ioapi.c
      pzlib_filefunc_def->zread_file = fread_file_func;
 diff -u ori\ioapi.h .\ioapi.h
 --- ori\ioapi.h	Mon Feb 15 05:59:40 2010
-+++ .\ioapi.h	Fri Apr 09 20:06:51 2010
-@@ -44,6 +44,10 @@
++++ .\ioapi.h	Sun Apr 11 13:33:50 2010
+@@ -44,6 +44,12 @@
  #include <stdlib.h>
  #include "zlib.h"
  
-+#if defined( __BORLANDC__ ) || defined( __WATCOM__ )
++#if defined( __BORLANDC__ ) || \
++    ( defined( __WATCOMC__ ) && __WATCOMC__ < 1290 ) || \
++    defined( __MINGW32CE__ )
 +#  define USE_FILE32API
 +#endif
 +