From e2de6c0119b22b3a0e384e041c9f2e50dab4ae04 Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Sun, 29 Mar 2009 20:53:47 +0000
Subject: [PATCH] 2009-03-29 22:26 UTC+0200 Viktor Szakats (harbour.01 syenar
 hu)   * config/dos/owatcom.cf   * config/win/owatcom.cf   *
 config/linux/owatcom.cf   * config/os2/owatcom.cf     % Tweaked optimization
 options. This will result in slower       build process, but more optimal
 runtime performance and       executable sizes. One option is now turned on
 which can       cause bad code with OW 1.1, so make sure you use latest      
 Open Watcom version, after all the upgrade is free.       It'd be great if
 owatcom users could make speedtst runs       with this revision and older
 ones to see the difference,       maybe now owatcom won't perform so poorly
 as before.     + Added link to C compiler option docs.     ! Fixed to convert
 slashes in HB_USER_CFLAGS.     % Enabled -5r for DOS and OS/2.

  * contrib/hbct/disk.c
    ! Disabled some volume/disk related code for WinCE.

  * contrib/xhb/hbserv.c
    ! Disabled for poccce.

  * contrib/hbnf/getenvrn.c
    ! Disabled FT_GETE() for poccce.
    ! Fixed FT_GETE() to return zero/empty string on platforms not
      supported (like also OS/2).

  * doc/en-EN/Makefile
  - doc/en-EN/error.txt
  + doc/en-EN/errsys.txt
  * source/rtl/Makefile
  - source/rtl/fserror.c
  - source/rtl/errorapi.c
  - source/rtl/errorapu.c
  - source/rtl/errorint.c
  - source/rtl/errorsys.prg
  + source/rtl/fserr.c
  + source/rtl/errapi.c
  + source/rtl/errint.c
  + source/rtl/errapiu.c
  + source/rtl/errsys.prg
  * contrib/examples/hbdoc/examples/core_es/Makefile
  - contrib/examples/hbdoc/examples/core_es/error.txt
  + contrib/examples/hbdoc/examples/core_es/errsys.txt
    * Most filenames containing 'error' renamed to make
      it easier to search for errors in build logs.
    ; Three headers remain.
---
 harbour/ChangeLog                             | 49 +++++++++++++++++++
 harbour/config/dos/owatcom.cf                 | 12 +++--
 harbour/config/linux/owatcom.cf               | 10 ++--
 harbour/config/os2/owatcom.cf                 | 10 ++--
 harbour/config/win/owatcom.cf                 | 12 +++--
 .../examples/hbdoc/examples/core_es/Makefile  |  2 +-
 .../core_es/{error.txt => errsys.txt}         |  0
 harbour/contrib/hbct/disk.c                   | 14 +++---
 harbour/contrib/hbnf/getenvrn.c               |  7 +--
 harbour/contrib/xhb/hbserv.c                  |  4 +-
 harbour/doc/en-EN/Makefile                    |  2 +-
 harbour/doc/en-EN/{error.txt => errsys.txt}   |  0
 harbour/source/rtl/Makefile                   | 10 ++--
 harbour/source/rtl/{errorapi.c => errapi.c}   |  0
 harbour/source/rtl/{errorapu.c => errapiu.c}  |  0
 harbour/source/rtl/{errorint.c => errint.c}   |  0
 .../source/rtl/{errorsys.prg => errsys.prg}   |  0
 harbour/source/rtl/{fserror.c => fserr.c}     |  0
 18 files changed, 100 insertions(+), 32 deletions(-)
 rename harbour/contrib/examples/hbdoc/examples/core_es/{error.txt => errsys.txt} (100%)
 rename harbour/doc/en-EN/{error.txt => errsys.txt} (100%)
 rename harbour/source/rtl/{errorapi.c => errapi.c} (100%)
 rename harbour/source/rtl/{errorapu.c => errapiu.c} (100%)
 rename harbour/source/rtl/{errorint.c => errint.c} (100%)
 rename harbour/source/rtl/{errorsys.prg => errsys.prg} (100%)
 rename harbour/source/rtl/{fserror.c => fserr.c} (100%)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index bdc5769086..1b32c9fb34 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,55 @@
    2009-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org)
 */
 
+2009-03-29 22:26 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
+  * config/dos/owatcom.cf
+  * config/win/owatcom.cf
+  * config/linux/owatcom.cf
+  * config/os2/owatcom.cf
+    % Tweaked optimization options. This will result in slower
+      build process, but more optimal runtime performance and
+      executable sizes. One option is now turned on which can
+      cause bad code with OW 1.1, so make sure you use latest
+      Open Watcom version, after all the upgrade is free.
+      It'd be great if owatcom users could make speedtst runs
+      with this revision and older ones to see the difference,
+      maybe now owatcom won't perform so poorly as before.
+    + Added link to C compiler option docs.
+    ! Fixed to convert slashes in HB_USER_CFLAGS.
+    % Enabled -5r for DOS and OS/2.
+
+  * contrib/hbct/disk.c
+    ! Disabled some volume/disk related code for WinCE.
+
+  * contrib/xhb/hbserv.c
+    ! Disabled for poccce.
+
+  * contrib/hbnf/getenvrn.c
+    ! Disabled FT_GETE() for poccce.
+    ! Fixed FT_GETE() to return zero/empty string on platforms not
+      supported (like also OS/2).
+
+  * doc/en-EN/Makefile
+  - doc/en-EN/error.txt
+  + doc/en-EN/errsys.txt
+  * source/rtl/Makefile
+  - source/rtl/fserror.c
+  - source/rtl/errorapi.c
+  - source/rtl/errorapu.c
+  - source/rtl/errorint.c
+  - source/rtl/errorsys.prg
+  + source/rtl/fserr.c
+  + source/rtl/errapi.c
+  + source/rtl/errint.c
+  + source/rtl/errapiu.c
+  + source/rtl/errsys.prg
+  * contrib/examples/hbdoc/examples/core_es/Makefile
+  - contrib/examples/hbdoc/examples/core_es/error.txt
+  + contrib/examples/hbdoc/examples/core_es/errsys.txt
+    * Most filenames containing 'error' renamed to make
+      it easier to search for errors in build logs.
+    ; Three headers remain.
+
 2009-03-29 22:07 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
   * harbour/tests/speedtst.prg
     * added warning message when HVM debugger is enabled
diff --git a/harbour/config/dos/owatcom.cf b/harbour/config/dos/owatcom.cf
index 9e1d58ee3e..75d66b3e17 100644
--- a/harbour/config/dos/owatcom.cf
+++ b/harbour/config/dos/owatcom.cf
@@ -1,8 +1,13 @@
 #
 # $Id$
 #
-# The Harbour project
-# GNU MAKE file for OpenWatcom
+
+# GNU MAKE file for Open Watcom C/C++ compiler
+
+# ---------------------------------------------------------------
+# See option docs here:
+#    http://www.users.pjwstk.edu.pl/~jms/qnx/help/watcom/compiler-tools/cpopts.html
+# ---------------------------------------------------------------
 
 include $(TOP)$(ROOT)config/$(HB_ARCHITECTURE)/global.cf
 
@@ -34,7 +39,6 @@ endif
 CC_IN =
 CC_OUT = -fo=
 
-#CPPFLAGS = -j -5s -5r -oehtz -s -zq -zt0 -bt=DOS
 CPPFLAGS = -zq -bt=DOS
 
 ifneq ($(HB_BUILD_WARN),no)
@@ -43,7 +47,7 @@ endif
 
 ifneq ($(HB_BUILD_OPTIM),no)
 # architecture flags
-CPPFLAGS += -5 -fp5
+CPPFLAGS += -5r -fp5
 
 # optimization flags
 # don't enable -ol optimization in OpenWatcom 1.1 - gives buggy code
diff --git a/harbour/config/linux/owatcom.cf b/harbour/config/linux/owatcom.cf
index 81d8c5bc5c..394ad76554 100644
--- a/harbour/config/linux/owatcom.cf
+++ b/harbour/config/linux/owatcom.cf
@@ -1,8 +1,13 @@
 #
 # $Id$
 #
-# The Harbour project
-# GNU MAKE file for OpenWatcom C/C++
+
+# GNU MAKE file for Open Watcom C/C++ compiler
+
+# ---------------------------------------------------------------
+# See option docs here:
+#    http://www.users.pjwstk.edu.pl/~jms/qnx/help/watcom/compiler-tools/cpopts.html
+# ---------------------------------------------------------------
 
 include $(TOP)$(ROOT)config/$(HB_ARCHITECTURE)/global.cf
 
@@ -24,7 +29,6 @@ endif
 CC_IN =
 CC_OUT = -fo=
 
-#CPPFLAGS = -j -5s -5r -oehtz -zq -bt=linux
 CPPFLAGS = -zq -bt=linux
 
 ifneq ($(HB_BUILD_WARN),no)
diff --git a/harbour/config/os2/owatcom.cf b/harbour/config/os2/owatcom.cf
index 0a74e220b7..dd4d0639c4 100644
--- a/harbour/config/os2/owatcom.cf
+++ b/harbour/config/os2/owatcom.cf
@@ -1,9 +1,14 @@
 #
 # $Id$
 #
-# The Harbour project
+
 # GNU MAKE file for Open Watcom C/C++ compiler
 
+# ---------------------------------------------------------------
+# See option docs here:
+#    http://www.users.pjwstk.edu.pl/~jms/qnx/help/watcom/compiler-tools/cpopts.html
+# ---------------------------------------------------------------
+
 include $(TOP)$(ROOT)config/$(HB_ARCHITECTURE)/global.cf
 
 OBJ_EXT = .obj
@@ -24,7 +29,6 @@ endif
 CC_IN =
 CC_OUT = -fo=
 
-#CPPFLAGS = -j -5s -5r -oxehtz -zq -mf -bt=OS2
 CPPFLAGS = -zq -bt=OS2
 
 ifneq ($(HB_BUILD_WARN),no)
@@ -33,7 +37,7 @@ endif
 
 ifneq ($(HB_BUILD_OPTIM),no)
 # architecture flags
-CPPFLAGS += -5 -fp5
+CPPFLAGS += -5r -fp5
 
 # optimization flags
 # don't enable -ol optimization in OpenWatcom 1.1 - gives buggy code
diff --git a/harbour/config/win/owatcom.cf b/harbour/config/win/owatcom.cf
index 6ce17fe9c5..fe2d48aeeb 100644
--- a/harbour/config/win/owatcom.cf
+++ b/harbour/config/win/owatcom.cf
@@ -1,9 +1,14 @@
 #
 # $Id$
 #
-# The Harbour project
+
 # GNU MAKE file for Open Watcom C/C++ compiler
 
+# ---------------------------------------------------------------
+# See option docs here:
+#    http://www.users.pjwstk.edu.pl/~jms/qnx/help/watcom/compiler-tools/cpopts.html
+# ---------------------------------------------------------------
+
 include $(TOP)$(ROOT)config/$(HB_ARCHITECTURE)/global.cf
 
 OBJ_EXT = .obj
@@ -24,7 +29,6 @@ endif
 CC_IN =
 CC_OUT = -fo=
 
-#CPPFLAGS = -j -5r -oxehtz -zq -mf -bt=NT
 CPPFLAGS = -zq -bt=NT -bm
 
 ifneq ($(HB_BUILD_WARN),no)
@@ -36,7 +40,7 @@ ifneq ($(HB_BUILD_OPTIM),no)
 CPPFLAGS += -5s -fp5
 # optimization flags
 # don't enable -ol optimization in OpenWatcom 1.1 - gives buggy code
-CPPFLAGS += -onaehtzr -ei -zp8 -s -zt0
+CPPFLAGS += -oxaht -ei -zp8 -zt0
 ifeq ($(CC),wpp386)
 CPPFLAGS += -oi+
 else
@@ -56,7 +60,7 @@ CPPFLAGS += -d2
 endif
 
 ifeq ($(CC),wcc386)
-CC_RULE = $(CC) $(subst /,\,$(CPPFLAGS)) $(subst /,\,$(CFLAGS)) $(HB_CDBG) $(HB_USER_CFLAGS) $(HB_CDYNLIB) $(subst /,\,$(CC_IN)) $(subst /,\,$<) $(CC_OUT)$(<F:.c=$(OBJ_EXT))
+CC_RULE = $(CC) $(subst /,\,$(CPPFLAGS)) $(subst /,\,$(CFLAGS)) $(HB_CDBG) $(subst /,\,$(HB_USER_CFLAGS)) $(HB_CDYNLIB) $(subst /,\,$(CC_IN)) $(subst /,\,$<) $(CC_OUT)$(<F:.c=$(OBJ_EXT))
 endif
 
 # Note: The empty line directly before 'endef' HAVE TO exist!
diff --git a/harbour/contrib/examples/hbdoc/examples/core_es/Makefile b/harbour/contrib/examples/hbdoc/examples/core_es/Makefile
index ea7edf02cb..67b0c1d9c8 100644
--- a/harbour/contrib/examples/hbdoc/examples/core_es/Makefile
+++ b/harbour/contrib/examples/hbdoc/examples/core_es/Makefile
@@ -23,7 +23,7 @@ DOC_FILES=\
 	dir.txt \
 	dirstruc.txt \
 	diskspac.txt \
-	error.txt \
+	errsys.txt \
 	eval.txt \
 	file.txt \
 	garbage.txt \
diff --git a/harbour/contrib/examples/hbdoc/examples/core_es/error.txt b/harbour/contrib/examples/hbdoc/examples/core_es/errsys.txt
similarity index 100%
rename from harbour/contrib/examples/hbdoc/examples/core_es/error.txt
rename to harbour/contrib/examples/hbdoc/examples/core_es/errsys.txt
diff --git a/harbour/contrib/hbct/disk.c b/harbour/contrib/hbct/disk.c
index b4343442c7..958bf98bde 100644
--- a/harbour/contrib/hbct/disk.c
+++ b/harbour/contrib/hbct/disk.c
@@ -249,7 +249,7 @@ HB_FUNC( VOLUME )
          if( fFree )
             hb_xfree( sDiskName );
       }
-#if defined(HB_OS_WIN)
+#if defined(HB_OS_WIN) && ! defined(HB_OS_WIN_CE)
       {
          LPTSTR lpRoot, lpVolName;
          lpRoot = sRoot ? HB_TCHAR_CONVTO( sRoot ) : NULL;
@@ -273,7 +273,7 @@ HB_FUNC( VOLUME )
  */
 HB_FUNC( GETVOLINFO )
 {
-#if defined(HB_OS_WIN)
+#if defined(HB_OS_WIN) && ! defined(HB_OS_WIN_CE)
    int iretval;
    char *sDrive = hb_parcx( 1 ), *sVolName;
    TCHAR lpVolName[256];
@@ -291,7 +291,7 @@ HB_FUNC( GETVOLINFO )
       HB_TCHAR_FREE( sVolName );
    }
    else
-      hb_retc( NULL );
+      hb_retc_null();
 #endif
 }
 
@@ -310,7 +310,7 @@ HB_FUNC( GETVOLINFO )
 
 HB_FUNC( VOLSERIAL )
 {
-#if defined(HB_OS_WIN)
+#if defined(HB_OS_WIN) && ! defined(HB_OS_WIN_CE)
    int retval;
    char *sDrive = hb_parcx( 1 );
    LPTSTR lpDrive;
@@ -337,11 +337,11 @@ HB_FUNC( VOLSERIAL )
 
 HB_FUNC( TRUENAME )
 {
-   char *szFile = hb_parc( 1 );
+   char * szFile = hb_parc( 1 );
 
    if( szFile )
    {
-#ifdef HB_OS_WIN
+#if defined(HB_OS_WIN) && ! defined(HB_OS_WIN_CE)
       char *szBuffRet;
       TCHAR buffer[MAX_PATH + 1] = { 0 };
       LPTSTR lpFile;
@@ -358,5 +358,5 @@ HB_FUNC( TRUENAME )
 #endif
    }
    else
-      hb_retc( NULL );
+      hb_retc_null();
 }
diff --git a/harbour/contrib/hbnf/getenvrn.c b/harbour/contrib/hbnf/getenvrn.c
index 0cea6c5179..463f220a02 100644
--- a/harbour/contrib/hbnf/getenvrn.c
+++ b/harbour/contrib/hbnf/getenvrn.c
@@ -118,7 +118,6 @@ HB_FUNC( FT_GETE )
 {
 #if defined(HB_OS_DOS) || defined(HB_OS_UNIX_COMPATIBLE)
    {
-
       char *buffer = NULL;
       int x;
       int buffsize = 0;
@@ -172,7 +171,7 @@ HB_FUNC( FT_GETE )
       /* return number of strings found */
       hb_retni( x );
    }
-#elif defined(HB_OS_WIN)
+#elif defined(HB_OS_WIN) && ! ( defined(HB_OS_WIN_CE) && defined(__POCC__) )
    {
       char *buffer = NULL;
       LPTCH lpEnviron = GetEnvironmentStrings();
@@ -246,6 +245,8 @@ HB_FUNC( FT_GETE )
       HB_TCHAR_FREE( szEnviron );
       FreeEnvironmentStrings( ( LPTSTR ) lpEnviron );
    }
-
+#else
+   hb_storc( NULL, 1 );
+   hb_retni( 0 );
 #endif
 }
diff --git a/harbour/contrib/xhb/hbserv.c b/harbour/contrib/xhb/hbserv.c
index 58cc334016..2237d99713 100644
--- a/harbour/contrib/xhb/hbserv.c
+++ b/harbour/contrib/xhb/hbserv.c
@@ -63,7 +63,9 @@
 
 #include <stdio.h>
 
-#if !defined( HB_OS_DOS ) && !defined( HB_OS_DARWIN_5 ) /* DOS and Darwin < 6.x can't compile this module */
+#if !defined( HB_OS_DOS ) && \
+    !defined( HB_OS_DARWIN_5 ) \ /* DOS and Darwin < 6.x can't compile this module */
+    ! ( defined(HB_OS_WIN_CE) && defined(__POCC__) )
 
 #if defined( HB_OS_UNIX ) || defined (HB_OS_OS2_GCC)
 #include <sys/types.h>
diff --git a/harbour/doc/en-EN/Makefile b/harbour/doc/en-EN/Makefile
index 78c7bc5e01..d8248c90e4 100644
--- a/harbour/doc/en-EN/Makefile
+++ b/harbour/doc/en-EN/Makefile
@@ -20,7 +20,7 @@ DOC_FILES=\
 	dbstrux.txt \
 	dir.txt \
 	diskspac.txt \
-	error.txt \
+	errsys.txt \
 	eval.txt \
 	file.txt \
 	garbage.txt \
diff --git a/harbour/doc/en-EN/error.txt b/harbour/doc/en-EN/errsys.txt
similarity index 100%
rename from harbour/doc/en-EN/error.txt
rename to harbour/doc/en-EN/errsys.txt
diff --git a/harbour/source/rtl/Makefile b/harbour/source/rtl/Makefile
index 57e0569d4b..5f03444763 100644
--- a/harbour/source/rtl/Makefile
+++ b/harbour/source/rtl/Makefile
@@ -31,9 +31,9 @@ C_SOURCES=\
 	disksphb.c   \
 	do.c         \
 	empty.c      \
-	errorapi.c   \
-	errorapu.c   \
-	errorint.c   \
+	errapi.c     \
+	errapiu.c    \
+	errint.c     \
 	file.c       \
 	filebuf.c    \
 	filehb.c     \
@@ -42,7 +42,7 @@ C_SOURCES=\
 	fmhb.c       \
 	fnsplit.c    \
 	fscopy.c     \
-	fserror.c    \
+	fserr.c      \
 	fssize.c     \
 	fstemp.c     \
 	gete.c       \
@@ -187,7 +187,7 @@ PRG_SOURCES=\
 	einstv52.prg \
 	einstvar.prg \
 	einstvau.prg \
-	errorsys.prg \
+	errsys.prg   \
 	fieldbl.prg  \
 	getlist.prg  \
 	getsys.prg   \
diff --git a/harbour/source/rtl/errorapi.c b/harbour/source/rtl/errapi.c
similarity index 100%
rename from harbour/source/rtl/errorapi.c
rename to harbour/source/rtl/errapi.c
diff --git a/harbour/source/rtl/errorapu.c b/harbour/source/rtl/errapiu.c
similarity index 100%
rename from harbour/source/rtl/errorapu.c
rename to harbour/source/rtl/errapiu.c
diff --git a/harbour/source/rtl/errorint.c b/harbour/source/rtl/errint.c
similarity index 100%
rename from harbour/source/rtl/errorint.c
rename to harbour/source/rtl/errint.c
diff --git a/harbour/source/rtl/errorsys.prg b/harbour/source/rtl/errsys.prg
similarity index 100%
rename from harbour/source/rtl/errorsys.prg
rename to harbour/source/rtl/errsys.prg
diff --git a/harbour/source/rtl/fserror.c b/harbour/source/rtl/fserr.c
similarity index 100%
rename from harbour/source/rtl/fserror.c
rename to harbour/source/rtl/fserr.c