mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-01-16 09:57:19 -05:00
Merge pull request #2543 from thunder2/warnings2
Removed compiler warnings in libretroshare
This commit is contained in:
commit
b10b1df6df
@ -23,22 +23,6 @@
|
|||||||
#include "util/rsdebug.h"
|
#include "util/rsdebug.h"
|
||||||
#include "util/rsstring.h"
|
#include "util/rsstring.h"
|
||||||
|
|
||||||
#include <sstream>
|
|
||||||
#include <sys/time.h>
|
|
||||||
static double getCurrentTS()
|
|
||||||
{
|
|
||||||
#ifndef WINDOWS_SYS
|
|
||||||
struct timeval cts_tmp;
|
|
||||||
gettimeofday(&cts_tmp, NULL);
|
|
||||||
double cts = (cts_tmp.tv_sec) + ((double) cts_tmp.tv_usec) / 1000000.0;
|
|
||||||
#else
|
|
||||||
struct _timeb timebuf;
|
|
||||||
_ftime( &timebuf);
|
|
||||||
double cts = (timebuf.time) + ((double) timebuf.millitm) / 1000.0;
|
|
||||||
#endif
|
|
||||||
return cts;
|
|
||||||
}
|
|
||||||
|
|
||||||
#ifdef SERVICE_DEBUG
|
#ifdef SERVICE_DEBUG
|
||||||
const int pqiservicezone = 60478;
|
const int pqiservicezone = 60478;
|
||||||
#endif
|
#endif
|
||||||
|
@ -1043,7 +1043,7 @@ void p3turtle::performLocalSearch(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void p3turtle::performLocalSearch_generic(RsTurtleGenericSearchRequestItem *item, uint32_t& req_result_count, std::list<RsTurtleSearchResultItem*>& result,uint32_t& max_allowed_hits)
|
void p3turtle::performLocalSearch_generic(RsTurtleGenericSearchRequestItem *item, uint32_t& /*req_result_count*/, std::list<RsTurtleSearchResultItem*>& result,uint32_t& max_allowed_hits)
|
||||||
{
|
{
|
||||||
unsigned char *search_result_data = NULL ;
|
unsigned char *search_result_data = NULL ;
|
||||||
uint32_t search_result_data_len = 0 ;
|
uint32_t search_result_data_len = 0 ;
|
||||||
|
Loading…
Reference in New Issue
Block a user