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

[simgear.git] / simgear / io / sg_socket_udp.cxx

diff --git a/simgear/io/sg_socket_udp.cxx b/simgear/io/sg_socket_udp.cxx
index 7c0a0d600ca70932cdd1b5e1e9906174aea97192..2d2971540f3b698538347154759044a7930995fb 100644 (file)
--- a/simgear/io/sg_socket_udp.cxx
+++ b/simgear/io/sg_socket_udp.cxx
@@ -16,7 +16,7 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 //
 // $Id$
 
@@ -26,14 +26,12 @@
 
 #include <simgear/compiler.h>
 
-#if defined( sgi )
-#include <strings.h>
-#endif
-
 #include <simgear/debug/logstream.hxx>
 
 #include "sg_socket_udp.hxx"
 
+#include <cstring>
+#include <cstdlib> // for atoi
 
 SGSocketUDP::SGSocketUDP( const string& host, const string& port ) :
     hostname(host),