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

merged upstream/master

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

10
libretroshare/src/rsserver/p3peers.h
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" #include "retroshare/rspeers.h"
class p3LinkMgr; class p3LinkMgr;

9
retroshare-gui/src/gui/settings/ServerPage.h
View file

@ -26,7 +26,14 @@
#include "ui_ServerPage.h" #include "ui_ServerPage.h"
#include "RsAutoUpdatePage.h" #include "RsAutoUpdatePage.h"
#include <inttypes.h> #include <inttypes.h>
#include <sys/socket.h> /* get OS-specific definitions for:
* struct sockaddr_storage
*/
#ifndef WINDOWS_SYS
#include <sys/socket.h>
#else
#include <winsock2.h>
#endif
class QNetworkReply; class QNetworkReply;
class QNetworkAccessManager; class QNetworkAccessManager;

9
retroshare-gui/src/util/RsNetUtil.h
View file

@ -24,7 +24,14 @@
#include <QString> #include <QString>
#include <inttypes.h> #include <inttypes.h>
#include <sys/socket.h> /* get OS-specific definitions for:
* struct sockaddr_storage
*/
#ifndef WINDOWS_SYS
#include <sys/socket.h>
#else
#include <winsock2.h>
#endif
class RsNetUtil class RsNetUtil
{ {