X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/22f3361e1cf25c52a2da8fdfc5cb081809e18fb9..f0834140313212fc54d09e28d21a95476d6545f2:/src/msw/utilsexc.cpp diff --git a/src/msw/utilsexc.cpp b/src/msw/utilsexc.cpp index 28fc5edfed..b646c56ae2 100644 --- a/src/msw/utilsexc.cpp +++ b/src/msw/utilsexc.cpp @@ -47,7 +47,7 @@ #include -#if !defined(__GNUWIN32__) && !defined(__WXWINE__) && !defined(__SALFORDC__) && !defined(__WXMICROWIN__) +#if !defined(__GNUWIN32__) && !defined(__SALFORDC__) && !defined(__WXMICROWIN__) #include #ifndef __MWERKS__ #include @@ -59,8 +59,10 @@ #include #endif -#if defined(__WIN32__) && !defined(__WXWINE__) && !defined(__WXMICROWIN__) -#include +#if defined(__WIN32__) && !defined(__WXMICROWIN__) +#ifndef __UNIX__ + #include +#endif #ifndef __GNUWIN32__ #include @@ -347,10 +349,6 @@ wxPipeInputStream::~wxPipeInputStream() bool wxPipeInputStream::CanRead() const { - // FIXME -#ifdef __WXWINE__ - return FALSE; -#else // !Wine if ( !IsOpened() ) return FALSE; @@ -387,7 +385,6 @@ bool wxPipeInputStream::CanRead() const } return nAvailable != 0; -#endif // Wine/!Wine } size_t wxPipeInputStream::OnSysRead(void *buffer, size_t len)