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

Fix MacOSX 10.10 Yosemite Compilation

Browse source 
by using retroshare.pri file like linux or windows,
 fixing namespace for unordered_set,
 fixing c++11 for ostream& operator<<,
 checking if ntohll and htonll already defined.
This commit is contained in:
Phenom 2015-12-21 17:25:02 +01:00
parent 8e9fe6d800
commit 86b559191e
11 changed files with 127 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

5
libretroshare/src/util/rsnet.cc
View file

@ -40,6 +40,7 @@
#define BIG_ENDIAN 4321
#endif
#ifndef ntohll
uint64_t ntohll(uint64_t x)
{
#ifdef BYTE_ORDER
@ -61,11 +62,13 @@ uint64_t ntohll(uint64_t x)
#endif
}
#endif
#ifndef htonll
uint64_t htonll(uint64_t x)
{
return ntohll(x);
}
#endif
void sockaddr_clear(struct sockaddr_in *addr)
{

4
libretroshare/src/util/rsnet.h
View file

@ -58,8 +58,12 @@ int inet_aton(const char *name, struct in_addr *addr);
/********************************** WINDOWS/UNIX SPECIFIC PART ******************/
/* 64 bit conversions */
#ifndef ntohll
uint64_t ntohll(uint64_t x);
#endif
#ifndef htonll
uint64_t htonll(uint64_t x);
#endif
/* blank a network address */
void sockaddr_clear(struct sockaddr_in *addr);