Erik Hofman:

Some small patches to make the code Irix/Muli platform compatible and
one small fix to make it plib-1.4.2 compatible also.

diff --git a/simgear/io/Makefile.am b/simgear/io/Makefile.am
index ef61ff85d3773427ddd4685df33a21c3fb05597d..92e1f1b628eda92bf9c46ed860d1277be8f7cbc1 100644 (file)
--- a/simgear/io/Makefile.am
+++ b/simgear/io/Makefile.am
@@ -39,14 +39,20 @@ tcp_server_SOURCES = tcp_server.cxx
 tcp_server_LDADD = \
        $(top_builddir)/simgear/io/libsgio.a \
        $(top_builddir)/simgear/debug/libsgdebug.a \
-       -lplibnet
+       $(top_builddir)/simgear/bucket/libsgbucket.a \
+       $(top_builddir)/simgear/misc/libsgmisc.a \
+       $(top_builddir)/simgear/xml/libsgxml.a \
+       -lplibnet -lz
 
 tcp_client_SOURCES = tcp_client.cxx
 
 tcp_client_LDADD = \
        $(top_builddir)/simgear/io/libsgio.a \
        $(top_builddir)/simgear/debug/libsgdebug.a \
-       -lplibnet
+       $(top_builddir)/simgear/bucket/libsgbucket.a \
+       $(top_builddir)/simgear/misc/libsgmisc.a \
+        $(top_builddir)/simgear/xml/libsgxml.a \
+       -lplibnet -lz
 
 socktest_SOURCES = socktest.cxx
 

diff --git a/simgear/io/sg_socket.cxx b/simgear/io/sg_socket.cxx
index b348ddf19f98cae3c862cce8e328044b4adbb4ec..20238727c3373e96706386f2ab15e75f1fa05941 100644 (file)
--- a/simgear/io/sg_socket.cxx
+++ b/simgear/io/sg_socket.cxx
@@ -46,7 +46,7 @@ SGSocket::SGSocket( const string& host, const string& port_,
 {
     if (!init)
     {
-       netInit();
+       netInit(NULL, NULL);    // plib-1.4.2 compatible
        init = true;
     }
 
@@ -54,7 +54,7 @@ SGSocket::SGSocket( const string& host, const string& port_,
     {
        is_tcp = true;
     }
-    else if ( style != "udp" )
+    else if ( style != (string)"udp" )
     {
        SG_LOG( SG_IO, SG_ALERT,
                "Error: SGSocket() unknown style = " << style );

diff --git a/simgear/io/tcp_client.cxx b/simgear/io/tcp_client.cxx
index a902bb1220907057892c113c337f1292c6cc7fbf..78548f53276d554f61a316598ca781bb4fcb623e 100644 (file)
--- a/simgear/io/tcp_client.cxx
+++ b/simgear/io/tcp_client.cxx
@@ -1,11 +1,14 @@
-#include <iostream>
+#include <simgear/compiler.h>
+#include STL_IOSTREAM
 #include <unistd.h>
 
 #include <simgear/debug/logstream.hxx>
 
 #include "sg_socket.hxx"
 
+#ifndef SG_HAVE_NATIVE_SGI_COMPILERS
 using std::cout;
+#endif
 
 class TcpClient
 {

diff --git a/simgear/io/tcp_server.cxx b/simgear/io/tcp_server.cxx
index ac7abddce348be4f16b6f78ff9990596e97218fa..cd9b8ea77410ac85837f216411c9d5f3dcac52c1 100644 (file)
--- a/simgear/io/tcp_server.cxx
+++ b/simgear/io/tcp_server.cxx
@@ -1,11 +1,14 @@
+#include <simgear/compiler.h>
 #include <simgear/debug/logstream.hxx>
-#include <string>
-#include <iostream>
+#include STL_STRING
+#include STL_IOSTREAM
 
 #include "sg_socket.hxx"
 
 using std::string;
+#ifndef SG_HAVE_NATIVE_SGI_COMPILERS
 using std::cout;
+#endif
 
 class TcpServer
 {