Merge branch 'next' into durk-atc

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

diff --git a/src/Network/jpg-httpd.cxx b/src/Network/jpg-httpd.cxx
index 8ef2c4357277e6adfaf0e6c2ee9251fb8ba14068..55e5e79c02c44619fddf7c50dfcebda0f9abfe50 100644 (file)
--- a/src/Network/jpg-httpd.cxx
+++ b/src/Network/jpg-httpd.cxx
@@ -31,9 +31,9 @@
 
 #include <simgear/compiler.h>
 
-#include <stdlib.h>            // atoi() atof()
+#include <cstdlib>             // atoi() atof()
 
-#include <string>
+#include <cstring>
 
 #include <simgear/debug/logstream.hxx>
 #include <simgear/io/iochannel.hxx>
@@ -52,9 +52,10 @@
 #define __HTTP_GET_STRING           "GET "
 
 #include <osgUtil/SceneView>
+#include <osgViewer/Viewer>
 extern osg::ref_ptr<osgUtil::SceneView> sceneView;
 
-SG_USING_STD(string);
+using std::string;
 
 
 bool FGJpegHttpd::open() {
@@ -74,7 +75,7 @@ bool FGJpegHttpd::open() {
 
 
 bool FGJpegHttpd::process() {
-    netChannel::poll();
+    simgear::NetChannel::poll();
 
     return true;
 }