diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 58d4a3ee46..d6d33d242a 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -1,3 +1,8 @@
+19990618-20:55 EDT David G. Holm <dholm@jsd-llc.com>
+  * source/rtl/dir.c
+    - Corrected #if test GNU C on Unix/Linux test to use && ! instead of || !
+      in order to force DJGPP to use DOS functions instead of Unix functions
+
 19990619-00:52 Ryszard Glab <rglab@imid.med.pl>
 
 * config/linux/gcc.cf
diff --git a/harbour/source/rtl/dir.c b/harbour/source/rtl/dir.c
index b4a6d51c23..701bcd4b52 100644
--- a/harbour/source/rtl/dir.c
+++ b/harbour/source/rtl/dir.c
@@ -262,7 +262,7 @@ HARBOUR HB_DIRECTORY( void )
          while(0==getchar());
 */
 
-#if defined(__GNUC__) || !defined(__DJGPP__)
+#if defined(__GNUC__) && !defined(__DJGPP__)
 /* GNU C on Linux or on other UNIX */
 	 aatrib[ 0 ] = '\0';
 	 if( S_ISREG(statbuf.st_mode) )