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 e218c149c3ed19086abad4d2e4b85716b4f75780..31d4b93375af4724799b0b1184b99a102ed29df1 100644 (file)
--- a/src/Network/httpd.cxx
+++ b/src/Network/httpd.cxx
@@ -32,9 +32,9 @@
 #include <simgear/compiler.h>
 
 #include <algorithm>           // sort()
-#include <stdlib.h>            // atoi() atof()
-
-#include STL_STRING
+#include <cstdlib>             // atoi() atof()
+#include <cstring>
+#include <string>
 
 #include <simgear/debug/logstream.hxx>
 #include <simgear/io/iochannel.hxx>
@@ -47,7 +47,7 @@
 
 #include "httpd.hxx"
 
-SG_USING_STD(string);
+using std::string;
 
 bool FGHttpd::open() {
     if ( is_enabled() ) {
@@ -66,7 +66,7 @@ bool FGHttpd::open() {
 
 
 bool FGHttpd::process() {
-    netChannel::poll();
+    simgear::NetChannel::poll();
 
     return true;
 }
@@ -267,7 +267,7 @@ void HttpdChannel::foundTerminator (void) {
         
         SG_LOG( SG_IO, SG_INFO, "size = " << response.length() );
         char ctmp[256];
-        sprintf(ctmp, "Content-Length: %d", response.length());
+        sprintf(ctmp, "Content-Length: %u", (unsigned)response.length());
         push( ctmp );
         push( getTerminator() );