From f37012c716c0b76655c57eb9a63ef723461d4ecc Mon Sep 17 00:00:00 2001
From: Przemyslaw Czerpak <druzus@priv.onet.pl>
Date: Tue, 7 Jul 2009 12:41:09 +0000
Subject: [PATCH] 2009-07-07 14:40 UTC+0200 Przemyslaw Czerpak
 (druzus/at/priv.onet.pl)   * harbour/source/rtl/hbproces.c     ! added
 missing #include

  * harbour/config/linux/watcom.cf
  * harbour/utils/hbmk2/hbmk2.prg
    ! synced OW compiler ABI flags in Linux builds
---
 harbour/ChangeLog              | 8 ++++++++
 harbour/config/linux/watcom.cf | 2 ++
 harbour/source/rtl/hbproces.c  | 1 +
 harbour/utils/hbmk2/hbmk2.prg  | 2 +-
 4 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index be0ae3f13e..dd37287a68 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,14 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-07-07 14:40 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
+  * harbour/source/rtl/hbproces.c
+    ! added missing #include
+
+  * harbour/config/linux/watcom.cf
+  * harbour/utils/hbmk2/hbmk2.prg
+    ! synced OW compiler ABI flags in Linux builds
+
 2009-07-07 11:42 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * contrib/hbtip/client.prg
     % Further simplified proxy handling code.
diff --git a/harbour/config/linux/watcom.cf b/harbour/config/linux/watcom.cf
index ceb1f9f8f8..3bc4d642d9 100644
--- a/harbour/config/linux/watcom.cf
+++ b/harbour/config/linux/watcom.cf
@@ -50,6 +50,8 @@ CPPFLAGS += -oi+
 else
 CPPFLAGS += -oi
 endif
+else
+CPPFLAGS += -3r
 endif
 
 
diff --git a/harbour/source/rtl/hbproces.c b/harbour/source/rtl/hbproces.c
index be9c406ed6..c6db4b9de6 100644
--- a/harbour/source/rtl/hbproces.c
+++ b/harbour/source/rtl/hbproces.c
@@ -63,6 +63,7 @@
 
 #if defined( HB_OS_UNIX )
 #  include <unistd.h>
+#  include <sys/time.h>
 #  include <sys/types.h>
 #  include <sys/wait.h>
 #  include <sys/stat.h>
diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg
index 4b9ae8767d..44bfe3c187 100644
--- a/harbour/utils/hbmk2/hbmk2.prg
+++ b/harbour/utils/hbmk2/hbmk2.prg
@@ -2606,7 +2606,7 @@ FUNCTION hbmk( aArgs, /* @ */ lPause, /* @ */ lUTF8 )
          ENDIF
          cOpt_CompC := ""
          IF hbmk[ _HBMK_lOPTIM ]
-            cOpt_CompC += " -6s -fp6"
+            cOpt_CompC += " -6r -fp6"
             cOpt_CompC += " -onaehtr -s -ei -zp4 -zt0"
             IF hbmk[ _HBMK_lCPP ] != NIL .AND. hbmk[ _HBMK_lCPP ]
                cOpt_CompC += " -oi+"