From ad7229c78adcfcdedb712ce576d19faf0fbe48c4 Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Mon, 15 Mar 2010 20:32:35 +0000
Subject: [PATCH] 2010-03-15 21:31 UTC+0100 Viktor Szakats (harbour.01
 syenar.hu)   * external/bzip2/Makefile   * external/bzip2/bzip2.dif   *
 external/bzip2/bzip2.c     + Added patch to make it compile on dos and
 os2/watcom.       Thanks to Przemek.

---
 harbour/ChangeLog                |  7 +++++++
 harbour/external/bzip2/Makefile  |  2 +-
 harbour/external/bzip2/bzip2.c   |  3 ++-
 harbour/external/bzip2/bzip2.dif | 14 ++++++++++++--
 4 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 694e7bd075..c1764e920d 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,13 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2010-03-15 21:31 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
+  * external/bzip2/Makefile
+  * external/bzip2/bzip2.dif
+  * external/bzip2/bzip2.c
+    + Added patch to make it compile on dos and os2/watcom.
+      Thanks to Przemek.
+
 2010-03-15 16:49 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
   + external/bzip2/bzip2.dif
     + Added .dif file.
diff --git a/harbour/external/bzip2/Makefile b/harbour/external/bzip2/Makefile
index aeda9833c5..e466ed5899 100644
--- a/harbour/external/bzip2/Makefile
+++ b/harbour/external/bzip2/Makefile
@@ -24,7 +24,7 @@ C_SOURCES := \
 _DET_DSP_NAME := bzip2
 _DET_VAR_INC_ := HB_INC_BZIP2
 _DET_VAR_HAS_ := HB_HAS_BZIP2
-_DET_FLT_PLAT := !dos !os2 !wce
+_DET_FLT_PLAT := !wce
 _DET_FLT_COMP :=
 _DET_INC_DEFP := /usr/include
 _DET_INC_LOCL := $(realpath $(TOP)$(ROOT)external/bzip2)
diff --git a/harbour/external/bzip2/bzip2.c b/harbour/external/bzip2/bzip2.c
index 04c9c49188..387e5931bf 100644
--- a/harbour/external/bzip2/bzip2.c
+++ b/harbour/external/bzip2/bzip2.c
@@ -34,7 +34,8 @@
 --*/
 #define BZ_LCCWIN32  0
 
-#if defined(_WIN32) && !defined(__CYGWIN__)
+#if ( defined(_WIN32) && !defined(__CYGWIN__) ) || \
+    ( defined(__WATCOMC__) && ( defined(__OS2__) || defined(__DOS__) ) )
 #undef  BZ_LCCWIN32
 #define BZ_LCCWIN32 1
 #undef  BZ_UNIX
diff --git a/harbour/external/bzip2/bzip2.dif b/harbour/external/bzip2/bzip2.dif
index 062ead14ee..85884199c1 100644
--- a/harbour/external/bzip2/bzip2.dif
+++ b/harbour/external/bzip2/bzip2.dif
@@ -1,6 +1,16 @@
 --- ori_src\bzip2.c	Sun Dec 09 04:22:12 2007
-+++ bzip2.c	Mon Mar 15 12:37:04 2010
-@@ -128,7 +128,7 @@
++++ bzip2.c	Mon Mar 15 21:30:03 2010
+@@ -34,7 +34,8 @@
+ --*/
+ #define BZ_LCCWIN32  0
+ 
+-#if defined(_WIN32) && !defined(__CYGWIN__)
++#if ( defined(_WIN32) && !defined(__CYGWIN__) ) || \
++    ( defined(__WATCOMC__) && ( defined(__OS2__) || defined(__DOS__) ) )
+ #undef  BZ_LCCWIN32
+ #define BZ_LCCWIN32 1
+ #undef  BZ_UNIX
+@@ -128,7 +129,7 @@
  #if BZ_LCCWIN32
  #   include <io.h>
  #   include <fcntl.h>