Merge branch 'next' of gitorious.org:fg/flightgear into next

[flightgear.git] / src / Network / httpd.cxx

diff --git a/src/Network/httpd.cxx b/src/Network/httpd.cxx
index 7adc4214d7a2cfff8c7dd35ef042aee738f192f7..31d4b93375af4724799b0b1184b99a102ed29df1 100644 (file)
--- a/src/Network/httpd.cxx
+++ b/src/Network/httpd.cxx
@@ -32,8 +32,8 @@
 #include <simgear/compiler.h>
 
 #include <algorithm>           // sort()
-#include <stdlib.h>            // atoi() atof()
-
+#include <cstdlib>             // atoi() atof()
+#include <cstring>
 #include <string>
 
 #include <simgear/debug/logstream.hxx>
@@ -66,7 +66,7 @@ bool FGHttpd::open() {
 
 
 bool FGHttpd::process() {
-    netChannel::poll();
+    simgear::NetChannel::poll();
 
     return true;
 }