From 3aa7c99ce60da8fe4f0b58fa612f5a0dee7624d2 Mon Sep 17 00:00:00 2001
From: Ryszard Glab <rglab@imid.med.pl>
Date: Thu, 2 Mar 2000 11:19:18 +0000
Subject: [PATCH] ChangeLog 20000302-12:35 GMT+1

---
 harbour/ChangeLog               | 10 ++++++++++
 harbour/source/pp/hbpp.c        |  9 +++++----
 harbour/source/rtl/typefile.prg |  2 +-
 3 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 0c4ed4d41e..b36b4c1279 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -1,3 +1,13 @@
+20000302-12:35 GMT+1 Ryszard Glab <rglab@imid.med.pl>
+
+    *source/pp/hbpp.c
+	*moved #include <sys/timeb.h> after harbour specific definitions
+	are defined (OS_UNIX_COMPATIBLE)
+	(BTW: is this include file really needed ? )
+
+    *source/rtl/typefile.prg
+	*removed RETURN NIL in a PROCEDURE
+	
 20000301-15:20 EST Paul Tucker <ptucker@sympatico.ca>
    * source/tools/strasint.c
      * remove extraneous characters at end.
diff --git a/harbour/source/pp/hbpp.c b/harbour/source/pp/hbpp.c
index 210c071629..d98f630904 100644
--- a/harbour/source/pp/hbpp.c
+++ b/harbour/source/pp/hbpp.c
@@ -59,16 +59,17 @@
 #include <string.h>
 #include <ctype.h>
 #include <time.h>
+
+#include "hbpp.h"
+#include "hberrors.h"
+#include "compiler.h"
+
 #if defined( OS_UNIX_COMPATIBLE )
    #include <sys/timeb.h>
 #else
    #include <sys\timeb.h>
 #endif
 
-#include "hbpp.h"
-#include "hberrors.h"
-#include "compiler.h"
-
 static COMMANDS * AddCommand( char * );                  /* Add new #command to an array  */
 static COMMANDS * AddTranslate( char * );                /* Add new #translate to an array  */
 static DEFINES *  DefSearch( char *, BOOL * );
diff --git a/harbour/source/rtl/typefile.prg b/harbour/source/rtl/typefile.prg
index 0b6b6483cb..6bd384eae4 100644
--- a/harbour/source/rtl/typefile.prg
+++ b/harbour/source/rtl/typefile.prg
@@ -93,7 +93,7 @@ PROCEDURE __TYPEFILE( cFile, lPrint )
       oErr:tries       := ++nRetries
       xRecover := Eval( ErrorBlock(), oErr )
       IF ISLOGICAL( xRecover ) .and. !xRecover      // user select "Default"
-         RETURN NIL
+         RETURN
       ENDIF
    ENDDO