Merge remote-tracking branch 'origin/master' into ticket

[stg.git] / projects / rscriptd / listener.h

diff --git a/projects/rscriptd/listener.h b/projects/rscriptd/listener.h
index abc03f6f9e60e16f21b8a46bafb11aa9d70a8a04..c6fb143a05c3104aeba54530ef9f1c12e296c31c 100644 (file)
--- a/projects/rscriptd/listener.h
+++ b/projects/rscriptd/listener.h
@@ -26,10 +26,10 @@
 #include <list>
 #include <functional>
 
-#include "os_int.h"
-#include "blowfish.h"
-#include "rs_packets.h"
-#include "stg_logger.h"
+#include "stg/os_int.h"
+#include "stg/blowfish.h"
+#include "stg/rs_packets.h"
+#include "stg/logger.h"
 
 struct UserData
 {
@@ -94,10 +94,9 @@ private:
     // Networking stuff
     bool                PrepareNet();
     bool                FinalizeNet();
-    bool                WaitPackets(int sd) const;
     bool                RecvPacket();
     // Parsing stuff
-    bool                CheckHeader(const RS_PACKET_HEADER & header) const;
+    bool                CheckHeader(const RS::PACKET_HEADER & header) const;
     bool                GetParams(char * buffer, UserData & data);
     // Processing stuff
     void                ProcessPending();