version 0.3.19

[fms.git] / include / freenet / freenetmasterthread.h

diff --git a/include/freenet/freenetmasterthread.h b/include/freenet/freenetmasterthread.h
index f84acc1..76d6102 100644 (file)
--- a/include/freenet/freenetmasterthread.h
+++ b/include/freenet/freenetmasterthread.h
@@ -7,12 +7,12 @@
 #include "ifcpconnected.h"\r
 #include "iperiodicprocessor.h"\r
 \r
-#include <zthread/Runnable.h>\r
+#include "../threadwrapper/cancelablerunnable.h"\r
 \r
 // forward declaration\r
 class IFreenetRegistrable;\r
 \r
-class FreenetMasterThread:public ZThread::Runnable,public ILogger, public IFCPMessageHandler\r
+class FreenetMasterThread:public CancelableRunnable,public ILogger, public IFCPMessageHandler\r
 {\r
 public:\r
        FreenetMasterThread();\r
@@ -33,7 +33,7 @@ private:
        void Shutdown();\r
 \r
        std::string m_fcphost;\r
-       long m_fcpport;\r
+       int m_fcpport;\r
        FCPv2 m_fcp;\r
        std::vector<IFreenetRegistrable *> m_registrables;\r
        std::vector<IPeriodicProcessor *> m_processors;\r