compilation fixes for separate build
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21420 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -31,6 +31,14 @@
|
||||
|
||||
#include "wx/unix/execute.h"
|
||||
|
||||
#if wxUSE_STREAMS
|
||||
|
||||
// define this to let wxexec.cpp know that we know what we're doing
|
||||
#define _WX_USED_BY_WXEXECUTE_
|
||||
#include "../common/execcmn.cpp"
|
||||
|
||||
#endif // wxUSE_STREAMS
|
||||
|
||||
#ifdef __WXBASE__
|
||||
|
||||
#if defined( __MWERKS__ ) && defined(__MACH__)
|
||||
@@ -347,22 +355,6 @@ bool wxShutdown(wxShutdownFlags wFlags)
|
||||
|
||||
#if wxUSE_STREAMS
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// wxPipeInputStream: stream for reading from a pipe
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
class wxPipeInputStream : public wxFileInputStream
|
||||
{
|
||||
public:
|
||||
wxPipeInputStream(int fd) : wxFileInputStream(fd) { }
|
||||
|
||||
// return TRUE if the pipe is still opened
|
||||
bool IsOpened() const { return !Eof(); }
|
||||
|
||||
// return TRUE if we have anything to read, don't block
|
||||
virtual bool CanRead() const;
|
||||
};
|
||||
|
||||
bool wxPipeInputStream::CanRead() const
|
||||
{
|
||||
if ( m_lasterror == wxSTREAM_EOF )
|
||||
@@ -399,10 +391,6 @@ bool wxPipeInputStream::CanRead() const
|
||||
}
|
||||
}
|
||||
|
||||
// define this to let wxexec.cpp know that we know what we're doing
|
||||
#define _WX_USED_BY_WXEXECUTE_
|
||||
#include "../common/execcmn.cpp"
|
||||
|
||||
#endif // wxUSE_STREAMS
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
|
Reference in New Issue
Block a user