diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index fe2b48918f..685e9a2b28 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -1,3 +1,9 @@
+19990730-20:04 CET Victor Szel <info@szelvesz.hu>
+   ! source/rtl/inkey.c
+     source/rtl/files.c
+     __CYGNUS__ -> __CYGWIN__
+   ! tests/working/testpre.prg - Typo fixed.
+
 19990730-14:00 EDT Paul Tucker <ptucker@sympatico.ca>
    * makefile.vc (reported by Matteo Baccan)
      + source/tools/fileread.prg
diff --git a/harbour/source/hbpp/hbpplib.c b/harbour/source/hbpp/hbpplib.c
index 678aa65c27..3670be050c 100644
--- a/harbour/source/hbpp/hbpplib.c
+++ b/harbour/source/hbpp/hbpplib.c
@@ -77,7 +77,7 @@ HARBOUR HB_PREPROCESS(void)
         // Some error here?
     }
 
-    hb_retc(ptr);
+    hb_retc(szOut);
 
     hb_xfree(pText);
     hb_xfree(pOut);
diff --git a/harbour/source/rtl/files.c b/harbour/source/rtl/files.c
index 423db2ae39..bd75c1edc2 100644
--- a/harbour/source/rtl/files.c
+++ b/harbour/source/rtl/files.c
@@ -8,7 +8,7 @@
 #include <string.h>
 #include "errorapi.h"
 
-#if defined(__CYGNUS__)
+#if defined(__CYGWIN__)
   #include <mingw32/share.h>
 #endif
 
diff --git a/harbour/source/rtl/inkey.c b/harbour/source/rtl/inkey.c
index 3bdc446de1..aa7e8f6c45 100644
--- a/harbour/source/rtl/inkey.c
+++ b/harbour/source/rtl/inkey.c
@@ -48,7 +48,7 @@
   #include <stdlib.h>
 #elif defined(__IBMCPP__)
   #include <conio.h>
-#elif defined(__CYGNUS__)
+#elif defined(__CYGWIN__)
   #include <mingw32/conio.h>
 #endif
 
@@ -192,7 +192,7 @@ void hb_inkeyPoll( void )     /* Poll the console keyboard to stuff the Harbour
    if( hb_set.HB_SET_TYPEAHEAD || s_inkeyPoll )
    {
       int ch = 0;
-#if defined(__CYGNUS__)
+#if defined(__CYGWIN__)
 #elif defined(OS_DOS_COMPATIBLE) || defined(HARBOUR_GCC_OS2) || defined(__IBMCPP__) || defined(_Windows)
    /* The reason for including _Windows here is that kbhit() and getch() appear 
      to work properly in console mode. For true Windows mode, changes are needed. */
diff --git a/harbour/tests/working/testpre.prg b/harbour/tests/working/testpre.prg
index 42d8a0a216..b6f76e0677 100644
--- a/harbour/tests/working/testpre.prg
+++ b/harbour/tests/working/testpre.prg
@@ -34,7 +34,7 @@ FUNCTION Main()
    qOut( Preprocess( cString ) )
    qOut( "" )
 
-   qOut( chr(13)+chr(10)+"Press any key..." )
+   qOut( chr(13)+chr(10)+"Press <Enter>..." )
    __Accept( "" )
 
    CLS
@@ -45,7 +45,7 @@ FUNCTION Main()
                 '', ;
                 '? MYFIELD, YOURFIELD', ;
                 '', ;
-                'WAIT "Press any key..."', ;
+                'WAIT "Press <Enter> key..."', ;
                 '', ;
                 'CLOSE ALL' }
 
@@ -59,7 +59,7 @@ FUNCTION Main()
 
       NEXT
       qOut( "" )
-      qOut( "Press any key..." )
+      qOut( "Press <Enter> key..." )
       __Accept( "" )
       CLS
    NEXT