fix the tests to pass with both gcc and msvc (2nd part of patch 1462778)

[wxWidgets.git] / include / wx / sckstrm.h

diff --git a/include/wx/sckstrm.h b/include/wx/sckstrm.h
index af1785542e70ce917b545a9713a6892d3e6dc4eb..30d01307579eff00b8fde56afb4fb00dfd4f88a4 100644 (file)
--- a/include/wx/sckstrm.h
+++ b/include/wx/sckstrm.h
@@ -11,10 +11,6 @@
 #ifndef __SCK_STREAM_H__
 #define __SCK_STREAM_H__
 
 #ifndef __SCK_STREAM_H__
 #define __SCK_STREAM_H__
 

-#if defined(__GNUG__) && !defined(__APPLE__)
-#pragma interface
-#endif
-

 #include "wx/stream.h"
 
 #if wxUSE_SOCKETS && wxUSE_STREAMS
 #include "wx/stream.h"
 
 #if wxUSE_SOCKETS && wxUSE_STREAMS


@@ -27,9 +23,9 @@ class WXDLLIMPEXP_NET wxSocketOutputStream : public wxOutputStream
   wxSocketOutputStream(wxSocketBase& s);
   ~wxSocketOutputStream();
 
   wxSocketOutputStream(wxSocketBase& s);
   ~wxSocketOutputStream();
 

-  off_t SeekO( off_t WXUNUSED(pos), wxSeekMode WXUNUSED(mode) )
+  wxFileOffset SeekO( wxFileOffset WXUNUSED(pos), wxSeekMode WXUNUSED(mode) )

     { return -1; }
     { return -1; }

-  off_t TellO() const
+  wxFileOffset TellO() const

     { return -1; }
 
  protected:
     { return -1; }
 
  protected:


@@ -46,9 +42,9 @@ class WXDLLIMPEXP_NET wxSocketInputStream : public wxInputStream
   wxSocketInputStream(wxSocketBase& s);
   ~wxSocketInputStream();
 
   wxSocketInputStream(wxSocketBase& s);
   ~wxSocketInputStream();
 

-  off_t SeekI( off_t WXUNUSED(pos), wxSeekMode WXUNUSED(mode) )
+  wxFileOffset SeekI( wxFileOffset WXUNUSED(pos), wxSeekMode WXUNUSED(mode) )

     { return -1; }
     { return -1; }

-  off_t TellI() const
+  wxFileOffset TellI() const

     { return -1; }
 
  protected:
     { return -1; }
 
  protected: