Replace static void * CONFIGPROTO::Run(void *) with normal method

[stg.git] / stglibs / srvconf.lib / servconf.h

diff --git a/stglibs/srvconf.lib/servconf.h b/stglibs/srvconf.lib/servconf.h
index 29151d62b4b59ad2912cf319e9f867b72b99806d..67c2f248dbae85c49b08fb1cf7f4eaa0189170e2 100644 (file)
--- a/stglibs/srvconf.lib/servconf.h
+++ b/stglibs/srvconf.lib/servconf.h
@@ -32,9 +32,9 @@
 #include <list>
 #include <string>
 
 #include <list>
 #include <string>
 

-#include "os_int.h"
+#include "stg/os_int.h"
+#include "stg/const.h"

 #include "netunit.h"
 #include "netunit.h"

-#include "stg_const.h"

 
 void Start(void *data, const char *el, const char **attr);
 void End(void *data, const char *el);
 
 void Start(void *data, const char *el, const char **attr);
 void End(void *data, const char *el);


@@ -204,7 +204,6 @@ private:
 
     RecvServerInfoDataCb_t RecvServerInfoDataCb;
     void * serverInfoDataCb;
 
     RecvServerInfoDataCb_t RecvServerInfoDataCb;
     void * serverInfoDataCb;

-    USERDATA user;

     int depth;
     bool error;
     SERVERINFO serverInfo;
     int depth;
     bool error;
     SERVERINFO serverInfo;


@@ -268,7 +267,6 @@ private:
 
     NETTRANSACT nt;
     int parseDepth;
 
     NETTRANSACT nt;
     int parseDepth;

-    USERDATA ud;

 
     std::string errorMsg;
     int error;
 
     std::string errorMsg;
     int error;