From: Włodzimierz Skiba <abx@abx.art.pl>
Date: Tue, 24 Oct 2006 11:21:37 +0000 (+0000)
Subject: Verify wx/filefn.h can be placed as first header in !PCH builds. Build fix for Watcom.
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/94268cae217d847157eebc3b1815f19395060661?ds=sidebyside

Verify wx/filefn.h can be placed as first header in !PCH builds. Build fix for Watcom.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42335 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/src/common/filefn.cpp b/src/common/filefn.cpp
index 3d385b468c..bdfd37b1a7 100644
--- a/src/common/filefn.cpp
+++ b/src/common/filefn.cpp
@@ -24,13 +24,15 @@
     #pragma hdrstop
 #endif
 
+#include "wx/filefn.h"
+
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
     #include "wx/log.h"
     #include "wx/utils.h"
 #endif
 
-#include "wx/file.h" // This does include filefn.h
+#include "wx/file.h"
 #include "wx/filename.h"
 #include "wx/dir.h"
 
@@ -1909,7 +1911,7 @@ wxFileKind wxGetFileKind(FILE *fp)
 #if defined(wxFILEKIND_STUB) || wxONLY_WATCOM_EARLIER_THAN(1,4)
     (void)fp;
     return wxFILE_KIND_DISK;
-#elif defined __WINDOWS__ && !defined __CYGWIN__
+#elif defined(__WINDOWS__) && !defined(__CYGWIN__) && !defined(__WATCOMC__)
     return fp ? wxGetFileKind(_fileno(fp)) : wxFILE_KIND_UNKNOWN;
 #else
     return fp ? wxGetFileKind(fileno(fp)) : wxFILE_KIND_UNKNOWN;