FGFS-4.1/simgear
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'next' of git@gitorious.org:fg/simgear into next

Browse Source
This commit is contained in:
James Turner 2010-07-23 06:30:37 +01:00
commit e3d1fa2686
3 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
simgear/io/Makefile.am
View File

@ -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 \

2
simgear/io/sg_socket.cxx
View File

@ -28,6 +28,8 @@
#include <simgear/compiler.h>
#include <iostream>
#include <cstring>
#include <cstdlib> // for atoi
#include <simgear/debug/logstream.hxx>

2
simgear/io/sg_socket_udp.cxx
View File

@ -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),