From d05b38d8d05a97ea27862f8c079143a2bd35af24 Mon Sep 17 00:00:00 2001
From: Alex Shashkov <shashkov@ostu.ru>
Date: Sat, 24 Feb 2001 15:08:27 +0000
Subject: [PATCH] 2001-02-23 18:10 UTC+0300 Alex Shashkov <shashkov@ostu.ru>   
 * harbour/source/rtl/console.c      ! Fixed bug STDOUT(..,"",..) on Watcom C
 11.0

   * harbour/source/pp/ppcore.c
   * harbour/source/pp/pragma.c
     ! Fixed extern declaration for Watcom C 11.0
---
 harbour/ChangeLog            | 8 ++++++++
 harbour/source/pp/ppcore.c   | 9 +++++++++
 harbour/source/pp/pragma.c   | 6 ++++++
 harbour/source/rtl/console.c | 3 ++-
 4 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 4a581e5cac..8b803e0f6e 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -1,3 +1,11 @@
+2001-02-24 18:10 UTC+0300 Alex Shashkov <shashkov@ostu.ru>
+   * harbour/source/rtl/console.c
+     ! Fixed bug STDOUT(..,"",..) on Watcom C 11.0
+
+   * harbour/source/pp/ppcore.c
+   * harbour/source/pp/pragma.c
+     ! Fixed extern declaration for Watcom C 11.0
+
 2001-02-24 12:45 UTC+0300 Alex Shashkov <shashkov@ostu.ru>
    * harbour/source/vm/dynsym.c
      ! Fixed
diff --git a/harbour/source/pp/ppcore.c b/harbour/source/pp/ppcore.c
index a8f79d19be..756d5e245b 100644
--- a/harbour/source/pp/ppcore.c
+++ b/harbour/source/pp/ppcore.c
@@ -177,6 +177,11 @@ char *     hb_pp_STD_CH = NULL;
 /* Ron Pinkas added 2000-11-21 */
 static BOOL s_bArray = FALSE;
 
+#if defined(__WATCOMC__)
+extern BOOL hb_pp_bInline;
+extern int hb_pp_LastOutLine;
+#endif
+
 /* Table with parse errors */
 char * hb_pp_szErrors[] =
 {
@@ -2761,7 +2766,9 @@ static void pp_rQuotes( char * expreal, char * sQuotes )
 
 int hb_pp_RdStr( FILE * handl_i, char * buffer, int maxlen, BOOL lDropSpaces, char * sBuffer, int * lenBuffer, int * iBuffer )
 {
+#ifndef __WATCOMC__
   extern BOOL hb_pp_bInline;
+#endif
   int readed = 0;
   int State = 0;
   char cha, cLast = '\0', symbLast = '\0';
@@ -2949,7 +2956,9 @@ int hb_pp_RdStr( FILE * handl_i, char * buffer, int maxlen, BOOL lDropSpaces, ch
 
 int hb_pp_WrStr( FILE * handl_o, char * buffer )
 {
+#ifndef __WATCOMC__
   extern int hb_pp_LastOutLine;
+#endif
   int lens = strlen(buffer);
 
   HB_TRACE(HB_TR_DEBUG, ("hb_pp_WrStr(%p, %s)", handl_o, buffer));
diff --git a/harbour/source/pp/pragma.c b/harbour/source/pp/pragma.c
index ee16e4bf72..265463661b 100644
--- a/harbour/source/pp/pragma.c
+++ b/harbour/source/pp/pragma.c
@@ -50,6 +50,10 @@ static BOOL s_bTracePragma = FALSE;
 /* Size of abreviated pragma commands */
 #define PRAGMAS_LEN       8
 
+#if defined(__WATCOMC__)
+  extern BOOL hb_pp_bInline;
+#endif
+
 /* TODO:  Add support for:
           RequestLib    /R
 */
@@ -173,7 +177,9 @@ void hb_pp_ParsePragma( char * szLine )
       {
          char sBuffer[ HB_PP_STR_SIZE ], *pBuffer, sDirective[9] ;
          int iSize;
+#ifndef __WATCOMC__
          extern BOOL hb_pp_bInline;
+#endif
          PINLINE pInline;
 
          if( hb_comp_bPPO )
diff --git a/harbour/source/rtl/console.c b/harbour/source/rtl/console.c
index a0c4d21e7e..7c851bdf71 100644
--- a/harbour/source/rtl/console.c
+++ b/harbour/source/rtl/console.c
@@ -166,7 +166,8 @@ static void hb_conOut( USHORT uiParam, hb_out_func_typedef * pOutFunc )
 
    pszString = hb_itemString( hb_param( uiParam, HB_IT_ANY ), &ulLen, &bFreeReq );
 
-   pOutFunc( pszString, ulLen );
+   if ( ulLen )
+      pOutFunc( pszString, ulLen );
 
    if( bFreeReq )
       hb_xfree( pszString );