mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-05-03 06:35:08 -04:00
suppressed #ifdef TURTLE_HOPPING from libretroshare, as it s not anymore needed.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1094 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
parent
99baceae7e
commit
4ef56e1b79
7 changed files with 40 additions and 40 deletions
|
@ -30,16 +30,14 @@
|
|||
#include "dbase/cachestrapper.h"
|
||||
#include "ft/ftserver.h"
|
||||
#include "ft/ftcontroller.h"
|
||||
#include "rsiface/rsturtle.h"
|
||||
|
||||
/* global variable now points straight to
|
||||
* ft/ code so variable defined here.
|
||||
*/
|
||||
|
||||
RsFiles *rsFiles = NULL;
|
||||
#ifdef TURTLE_HOPPING
|
||||
#include "rsiface/rsturtle.h"
|
||||
RsTurtle *rsTurtle = NULL ;
|
||||
#endif
|
||||
|
||||
#include "pqi/pqipersongrp.h"
|
||||
#include "pqi/pqisslpersongrp.h"
|
||||
|
@ -63,10 +61,7 @@ RsTurtle *rsTurtle = NULL ;
|
|||
#include "services/p3channels.h"
|
||||
#include "services/p3status.h"
|
||||
#include "services/p3Qblog.h"
|
||||
|
||||
#ifdef TURTLE_HOPPING
|
||||
#include "services/p3turtle.h"
|
||||
#endif
|
||||
|
||||
#include <list>
|
||||
#include <string>
|
||||
|
@ -650,11 +645,10 @@ int RsServer::StartupRetroShare()
|
|||
msgSrv = new p3MsgService(mConnMgr);
|
||||
chatSrv = new p3ChatService(mConnMgr);
|
||||
|
||||
#ifdef TURTLE_HOPPING
|
||||
p3turtle *tr = new p3turtle(mConnMgr) ;
|
||||
rsTurtle = tr ;
|
||||
pqih -> addService(tr);
|
||||
#endif
|
||||
|
||||
pqih -> addService(ad);
|
||||
pqih -> addService(msgSrv);
|
||||
pqih -> addService(chatSrv);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue