Linux build fixes, now netSocket.h is no longer included.

diff --git a/simgear/io/Makefile.am b/simgear/io/Makefile.am
index 1f354897485477c6dcbbc983cd355e8a0968a15a..d61a6165beeabf0de489fbce562967e4a2616d89 100644 (file)
--- a/simgear/io/Makefile.am
+++ b/simgear/io/Makefile.am
@@ -30,6 +30,7 @@ tcp_server_SOURCES = tcp_server.cxx
 
 tcp_server_LDADD = \
        libsgio.a \
+       $(top_builddir)/simgear/structure/libsgstructure.a \    
        $(top_builddir)/simgear/debug/libsgdebug.a \
        $(top_builddir)/simgear/bucket/libsgbucket.a \
        $(top_builddir)/simgear/misc/libsgmisc.a \
@@ -41,6 +42,7 @@ tcp_client_SOURCES = tcp_client.cxx
 
 tcp_client_LDADD = \
        libsgio.a \
+       $(top_builddir)/simgear/structure/libsgstructure.a \
        $(top_builddir)/simgear/debug/libsgdebug.a \
        $(top_builddir)/simgear/bucket/libsgbucket.a \
        $(top_builddir)/simgear/misc/libsgmisc.a \
@@ -52,6 +54,7 @@ socktest_SOURCES = socktest.cxx
 
 socktest_LDADD = \
        libsgio.a \
+       $(top_builddir)/simgear/structure/libsgstructure.a \
        $(top_builddir)/simgear/debug/libsgdebug.a \
        $(top_builddir)/simgear/bucket/libsgbucket.a \
        $(top_builddir)/simgear/misc/libsgmisc.a \
@@ -63,6 +66,7 @@ lowtest_SOURCES = lowtest.cxx
 
 lowtest_LDADD = \
        libsgio.a \
+       $(top_builddir)/simgear/structure/libsgstructure.a \
        $(top_builddir)/simgear/debug/libsgdebug.a \
        $(top_builddir)/simgear/bucket/libsgbucket.a \
        $(top_builddir)/simgear/misc/libsgmisc.a \

diff --git a/simgear/io/sg_socket.cxx b/simgear/io/sg_socket.cxx
index 14ae296937ee74c574a10dd39f16047f4255d689..636ff3452b19c8719640ccf7eb36ad4a93add1a5 100644 (file)
--- a/simgear/io/sg_socket.cxx
+++ b/simgear/io/sg_socket.cxx
@@ -28,6 +28,8 @@
 #include <simgear/compiler.h>
 
 #include <iostream>
+#include <cstring>
+#include <cstdlib> // for atoi
 
 #include <simgear/debug/logstream.hxx>
 

diff --git a/simgear/io/sg_socket_udp.cxx b/simgear/io/sg_socket_udp.cxx
index bdc04d1154b143a32292be228a446d759a1dd242..2d2971540f3b698538347154759044a7930995fb 100644 (file)
--- a/simgear/io/sg_socket_udp.cxx
+++ b/simgear/io/sg_socket_udp.cxx
@@ -30,6 +30,8 @@
 
 #include "sg_socket_udp.hxx"
 
+#include <cstring>
+#include <cstdlib> // for atoi
 
 SGSocketUDP::SGSocketUDP( const string& host, const string& port ) :
     hostname(host),