merged upstream/master

This commit is contained in:
csoler 2016-11-12 15:53:17 +01:00
commit c07dd83ba9
3 changed files with 25 additions and 3 deletions

View file

@ -26,7 +26,15 @@
*
*/
#include <sys/socket.h>
/* get OS-specific definitions for:
* struct sockaddr_storage
*/
#ifndef WINDOWS_SYS
#include <sys/socket.h>
#else
#include <winsock2.h>
#endif
#include "retroshare/rspeers.h"
class p3LinkMgr;