Removed windows headers and moved NetServer a bit closer to standard

1 files changed, 11 insertions, 10 deletions

diff --git a/NetEx/NetServer.h b/NetEx/NetServer.h
index 0869f2a..1fcc938 100644
--- a/NetEx/NetServer.h
+++ b/NetEx/NetServer.h
@@ -3,21 +3,22 @@
     Copyright (c) 2011-2012, Starshatter OpenSource Distribution Contributors
     Copyright (c) 1997-2006, Destroyer Studios LLC.
 
-     AUTHOR:       John DiCamillo
+    AUTHOR:       John DiCamillo
 
 
-     OVERVIEW
-     ========
-     Network Server Pump for HTTP Server
+    OVERVIEW
+    ========
+    Network Server Pump for HTTP Server
 */
 
 
 #ifndef NetServer_h
 #define NetServer_h
 
+#include <cstdint>
 #include <mutex>
+#include <thread>
 
-#include <windows.h>
 #include "NetAddr.h"
 #include "NetGram.h"
 #include "NetSock.h"
@@ -30,14 +31,14 @@ class NetServer
 public:
     static const char* TYPENAME() { return "NetServer"; }
 
-    NetServer(WORD port, int poolsize=1);
+    NetServer(std::uint16_t port, int poolsize=1);
     virtual ~NetServer();
 
     int operator == (const NetServer& l) const { return addr == l.addr; }
 
     virtual void      Shutdown();
-    virtual DWORD     Listener();
-    virtual DWORD     Reader(int index);
+    virtual void      Listener();
+    virtual void      Reader(int index);
 
     virtual Text      ProcessRequest(Text request, const NetAddr& addr);
     virtual Text      DefaultResponse();
@@ -52,8 +53,8 @@ protected:
     NetAddr           client_addr;
 
     int               poolsize;
-    HANDLE            hreader;
-    HANDLE*           pool;
+    std::thread       hreader;
+    std::thread*      pool;
     NetSock**         conn;
     NetAddr*          clients;
     int               err;