Don't define __STRICT_ANSI__, we should build both with and without it.

[wxWidgets.git] / include / wx / unix / pipe.h

diff --git a/include/wx/unix/pipe.h b/include/wx/unix/pipe.h
index d1a058beca4d76e8ea2016a2abe595f0a7ae6bed..e8e2d427cb389e46913e3674cc9826074d412179 100644 (file)
--- a/include/wx/unix/pipe.h
+++ b/include/wx/unix/pipe.h
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     24.06.2003 (extracted from src/unix/utilsunx.cpp)
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     24.06.2003 (extracted from src/unix/utilsunx.cpp)

-// RCS-ID:      $Id$

 // Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////


@@ -13,6 +12,7 @@
 #define _WX_UNIX_PIPE_H_
 
 #include <unistd.h>
 #define _WX_UNIX_PIPE_H_
 
 #include <unistd.h>

+#include <fcntl.h>

 
 #include "wx/log.h"
 #include "wx/intl.h"
 
 #include "wx/log.h"
 #include "wx/intl.h"


@@ -52,6 +52,16 @@ public:
         return true;
     }
 
         return true;
     }
 

+    // switch the given end of the pipe to non-blocking IO
+    bool MakeNonBlocking(Direction which)
+    {
+        const int flags = fcntl(m_fds[which], F_GETFL, 0);
+        if ( flags == -1 )
+            return false;
+
+        return fcntl(m_fds[which], F_SETFL, flags | O_NONBLOCK) == 0;
+    }
+

     // return TRUE if we were created successfully
     bool IsOk() const { return m_fds[Read] != INVALID_FD; }
 
     // return TRUE if we were created successfully
     bool IsOk() const { return m_fds[Read] != INVALID_FD; }
 


@@ -88,27 +98,5 @@ private:
     int m_fds[2];
 };
 
     int m_fds[2];
 };
 

-#if wxUSE_STREAMS && wxUSE_FILE
-
-#include "wx/wfstream.h"
-
-// ----------------------------------------------------------------------------
-// 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;
-};
-
-#endif // wxUSE_STREAMS && wxUSE_FILE
-

 #endif // _WX_UNIX_PIPE_H_
 
 #endif // _WX_UNIX_PIPE_H_