Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42335 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2006-10-24 11:21:37 +00:00
parent abbe3d379e
commit 94268cae21
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/common/filefn.cpp
View File

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