Updated testconf,

Compile fixes for docview and iostreams,
  SO_RCVTIMEO doesn't exist everywhere and must
   not be used for setting this option - only
   getting it on some systems
  Distrib things


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3230 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

src/common/docview.cpp

@@ -294,7 +294,7 @@ bool wxDocument::OnSaveDocument(const wxString& file)
         // Saving error
         return FALSE;
     }
-    if (SaveObject(store)==FALSE)
+    if (!SaveObject(store))
     {
         (void)wxMessageBox(_("Sorry, could not save this file."), msgTitle, wxOK | wxICON_EXCLAMATION,
                            GetDocumentWindow());
@@ -329,7 +329,7 @@ bool wxDocument::OnOpenDocument(const wxString& file)
                            GetDocumentWindow());
         return FALSE;
     }
-    if (LoadObject(store)==FALSE)
+    if (!LoadObject(store))
     {
         (void)wxMessageBox(_("Sorry, could not open this file."), msgTitle, wxOK|wxICON_EXCLAMATION,
                            GetDocumentWindow());
@@ -346,25 +346,21 @@ bool wxDocument::OnOpenDocument(const wxString& file)
 
 #if wxUSE_STD_IOSTREAM
 istream& wxDocument::LoadObject(istream& stream)
-{
-    return stream;
-}
-
-ostream& wxDocument::SaveObject(ostream& stream)
-{
-    return stream;
-}
 #else
-bool wxDocument::LoadObject(wxInputStream& stream)
+wxInputStream& wxDocument::LoadObject(wxInputStream& stream)
+#endif
 {
-    return TRUE;
+    return stream;
 }
 
-bool wxDocument::SaveObject(wxOutputStream& stream)
-{
-    return TRUE;
-}
+#if wxUSE_STD_IOSTREAM
+ostream& wxDocument::SaveObject(ostream& stream)
+#else
+wxOutputStream& wxDocument::SaveObject(wxOutputStream& stream)
 #endif
+{
+    return stream;
+}
 
 bool wxDocument::Revert()
 {

src/unix/gsocket.c

@@ -494,6 +494,10 @@ void GSocket_SetTimeout(GSocket *socket, unsigned long millisec)
   assert(socket != NULL);
 
   socket->m_timeout = millisec;
+  /* Neither GLIBC 2.0 nor the kernel 2.0.36 define SO_SNDTIMEO or
+     SO_RCVTIMEO. The man pages, that these flags should exist but
+     are read only. RR. */
+#ifndef __LINUX__
   if (socket->m_fd != -1) {
     struct timeval tval;
 
@@ -502,6 +506,7 @@ void GSocket_SetTimeout(GSocket *socket, unsigned long millisec)
     setsockopt(socket->m_fd, SOL_SOCKET, SO_SNDTIMEO, &tval, sizeof(tval));
     setsockopt(socket->m_fd, SOL_SOCKET, SO_RCVTIMEO, &tval, sizeof(tval));
   }
+#endif
 }
 
 /*