From 5823faadb1a07ce044a6d266bd9b1ecc77a0ddde Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Sat, 10 Apr 2010 08:18:05 +0000
Subject: [PATCH] 2010-04-10 10:13 UTC+0200 Viktor Szakats (harbour.01
 syenar.hu)   * external/zlib/zlib.dif   * external/zlib/zconf.h     ! Tweak
 to make it build with BCC (when this specific       constant is defined, f.e.
 by libharu).

  * external/pcre/Makefile
    ! Tweak to make 8.02 work with BCC.
    ; NOTE: BCC is seemingly not tested/used by any important
            external projects. If it goes like this, I will stop
            doing these updates and leave them to real BCC users.
            It's going against the flow.

  * config/postinst.prg
    * /V2 -> -V2 to make *nix shells happy.
---
 harbour/ChangeLog              | 16 ++++++++++++++++
 harbour/config/postinst.prg    |  2 +-
 harbour/external/pcre/Makefile |  3 ++-
 harbour/external/zlib/zconf.h  |  2 ++
 harbour/external/zlib/zlib.dif | 22 +++++++++++++++++++++-
 5 files changed, 42 insertions(+), 3 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index a892f648fb..73a492158b 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,22 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2010-04-10 10:13 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * external/zlib/zlib.dif
+  * external/zlib/zconf.h
+    ! Tweak to make it build with BCC (when this specific
+      constant is defined, f.e. by libharu).
+
+  * external/pcre/Makefile
+    ! Tweak to make 8.02 work with BCC.
+    ; NOTE: BCC is seemingly not tested/used by any important
+            external projects. If it goes like this, I will stop
+            doing these updates and leave them to real BCC users.
+            It's going against the flow.
+
+  * config/postinst.prg
+    * /V2 -> -V2 to make *nix shells happy.
+
 2010-04-09 23:15 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * harbour.spec
   * utils/hbmk2/examples/contribf.hbc
diff --git a/harbour/config/postinst.prg b/harbour/config/postinst.prg
index 645f23a951..6ddb434d1b 100644
--- a/harbour/config/postinst.prg
+++ b/harbour/config/postinst.prg
@@ -192,7 +192,7 @@ PROCEDURE Main()
          OutStd( "! Making Harbour .exe install package: '" + tmp + "'" + hb_osNewLine() )
 
          hb_processRun( GetEnv( "HB_DIR_NSIS" ) + "makensis.exe" +;
-                        " /V2" +;
+                        " -V2" +;
                         " " + FN_Escape( "package\mpkg_win.nsi" ) )
       ENDIF
    ENDIF
diff --git a/harbour/external/pcre/Makefile b/harbour/external/pcre/Makefile
index e67b311025..ac49d9aac0 100644
--- a/harbour/external/pcre/Makefile
+++ b/harbour/external/pcre/Makefile
@@ -48,9 +48,10 @@ ifneq ($(HB_HAS_PCRE_LOCAL),)
       endif
    endif
 
-   # suppress bcc warnings
+   # suppress bcc warnings and tweak to make it build
    ifeq ($(HB_COMPILER),bcc)
       HB_CFLAGS += -w-use -w-csu -w-aus -w-sig
+      HB_CFLAGS += -DHAVE_INTTYPES_H=0
    endif
 
    HB_CFLAGS += -DHAVE_CONFIG_H
diff --git a/harbour/external/zlib/zconf.h b/harbour/external/zlib/zconf.h
index dad365a60c..995f9eed7a 100644
--- a/harbour/external/zlib/zconf.h
+++ b/harbour/external/zlib/zconf.h
@@ -371,9 +371,11 @@ typedef uLong FAR uLongf;
    typedef Byte       *voidp;
 #endif
 
+#if 0
 #ifdef HAVE_UNISTD_H    /* may be set to #if 1 by ./configure */
 #  define Z_HAVE_UNISTD_H
 #endif
+#endif
 
 #ifdef Z_HAVE_UNISTD_H
 #  include <sys/types.h>    /* for off_t */
diff --git a/harbour/external/zlib/zlib.dif b/harbour/external/zlib/zlib.dif
index 5dc7bdd198..1f1686673d 100644
--- a/harbour/external/zlib/zlib.dif
+++ b/harbour/external/zlib/zlib.dif
@@ -53,7 +53,16 @@ diff -u ori\deflate.c .\deflate.c
 Only in .: ori
 diff -u ori\zconf.h .\zconf.h
 --- ori\zconf.h	Sun Feb 21 16:38:24 2010
-+++ .\zconf.h	Fri Apr 09 14:34:48 2010
++++ .\zconf.h	Sat Apr 10 10:04:40 2010
+@@ -3,7 +3,7 @@
+  * For conditions of distribution and use, see copyright notice in zlib.h
+  */
+ 
+-/* @(#) $Id$ */
++/* @(#) $Id: zconf.h 14300 2010-04-09 12:44:20Z vszakats $ */
+ 
+ #ifndef ZCONF_H
+ #define ZCONF_H
 @@ -140,7 +140,18 @@
  #if defined(_WINDOWS) && !defined(WINDOWS)
  #  define WINDOWS
@@ -74,6 +83,17 @@ diff -u ori\zconf.h .\zconf.h
  #  ifndef WIN32
  #    define WIN32
  #  endif
+@@ -360,8 +371,10 @@
+    typedef Byte       *voidp;
+ #endif
+ 
++#if 0
+ #ifdef HAVE_UNISTD_H    /* may be set to #if 1 by ./configure */
+ #  define Z_HAVE_UNISTD_H
++#endif
+ #endif
+ 
+ #ifdef Z_HAVE_UNISTD_H
 Only in .: zlib.dif
 diff -u ori\zutil.c .\zutil.c
 --- ori\zutil.c	Sat Jan 09 15:23:48 2010