properly add librt when clock_gettime is used

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

diff --git a/src/Network/httpd.cxx b/src/Network/httpd.cxx
index feee746eafeea751f3fdbb9ad254124590f0b189..f301f552d5b2c6ebad9b639903a3621c261271f5 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,9 +47,7 @@
 
 #include "httpd.hxx"
 
-SG_USING_STD(string);
-SG_USING_STD(cout);
-
+using std::string;
 
 bool FGHttpd::open() {
     if ( is_enabled() ) {
@@ -68,7 +66,7 @@ bool FGHttpd::open() {
 
 
 bool FGHttpd::process() {
-    netChannel::poll();
+    simgear::NetChannel::poll();
 
     return true;
 }
@@ -149,7 +147,7 @@ void HttpdChannel::foundTerminator (void) {
                             if ( !globals->get_commands()
                                  ->execute(urlDecode(b).c_str(), &args) )
                             {
-                                SG_LOG( SG_GENERAL, SG_ALERT,
+                                SG_LOG( SG_NETWORK, SG_ALERT,
                                         "Command " << urlDecode(b)
                                         << " failed.");
                             }
@@ -269,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() );