Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-06-05 05:12:51 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request from PhenomRetroShare/Fix_MacOSX_Compilation

Browse source 
Fix MacOSX compilation.
This commit is contained in:
csoler 2017-04-21 19:45:30 +02:00 • committed by GitHub
commit 4ab60219b2
2 changed files with 5 additions and 0 deletions
retroshare-gui/src/gui/elastic
fft.h
tests/unittests/libretroshare/gxs/nxs_test
nxstesthub.cc

4
retroshare-gui/src/gui/elastic/fft.h
View file

@ -104,7 +104,11 @@ public:
w[nwh] = cos(delta * nwh); w[nwh] = cos(delta * nwh);
w[nwh + 1] = w[nwh]; w[nwh + 1] = w[nwh];
for (j = 2; j <= nwh - 2; j += 2) { for (j = 2; j <= nwh - 2; j += 2) {
#ifdef __APPLE__
__sincos(delta*j,&y,&x);
#else
sincos(delta*j,&y,&x) ; sincos(delta*j,&y,&x) ;
#endif
//x = cos(delta * j); //x = cos(delta * j);
//y = sin(delta * j); //y = sin(delta * j);
w[j] = x; w[j] = x;

1
tests/unittests/libretroshare/gxs/nxs_test/nxstesthub.cc
View file

@ -53,6 +53,7 @@ public:
{ {
return recvItem(i); return recvItem(i);
} }
bool getServiceItemNames(uint32_t /*service_type*/, std::map<uint8_t,std::string>& /*names*/) { return false; }
private: private:
RsPeerId mPeerId; RsPeerId mPeerId;
RecvPeerItemIface* mRecvIface; RecvPeerItemIface* mRecvIface;