Fixed compile of libretroshare on Windows. The corrected pro files are not included.

Moved the includes of rswin.h from the header files to the c files.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5655 b45a01b8-16f6-495d-af2f-9b41ad6348cc

libretroshare/src/pqi/authgpg.h

@@ -39,7 +39,6 @@
 #ifndef RS_GPG_AUTH_HEADER
 #define RS_GPG_AUTH_HEADER
 
-#include "util/rswin.h"
 #include <openssl/ssl.h>
 #include <openssl/evp.h>
 #include "util/rsthreads.h"

libretroshare/src/pqi/authssl.cc

@@ -28,6 +28,10 @@
  *
  */
 
+#ifdef WINDOWS_SYS
+#include "util/rswin.h"
+#endif // WINDOWS_SYS
+
 #include "authssl.h"
 #include "sslfns.h"
 #include "cleanupxpgp.h"

libretroshare/src/pqi/authssl.h

@@ -39,8 +39,6 @@
  * 
  */
 
-#include "util/rswin.h"
-
 #include <openssl/ssl.h>
 #include <openssl/evp.h>
 

libretroshare/src/pqi/pqinetwork.cc

@@ -23,8 +23,10 @@
  *
  */
 
-
-
+#ifdef WINDOWS_SYS
+#include "util/rswin.h"
+#include <ws2tcpip.h>
+#endif // WINDOWS_SYS
 
 #include "pqi/pqinetwork.h"
 #include "util/rsnet.h"

libretroshare/src/pqi/pqinetwork.h

@@ -45,12 +45,10 @@
 
 #else
 
-#include "util/rswin.h"
 
 #include "util/rsnet.h" /* more generic networking header */
 
 #include <winsock2.h>
-#include <ws2tcpip.h>
 typedef int socklen_t;
 //typedef unsigned long in_addr_t;
 

libretroshare/src/pqi/pqissl.h

@@ -28,8 +28,6 @@
 #ifndef MRK_PQI_SSL_HEADER
 #define MRK_PQI_SSL_HEADER
 
-#include "util/rswin.h"
-
 #include <openssl/ssl.h>
 
 // operating system specific network header.

libretroshare/src/pqi/pqissludp.h

@@ -28,8 +28,6 @@
 #ifndef MRK_PQI_SSL_UDP_HEADER
 #define MRK_PQI_SSL_UDP_HEADER
 
-#include "util/rswin.h"
-
 #include <openssl/ssl.h>
 
 // operating system specific network header.

libretroshare/src/pqi/sslfns.h

@@ -33,8 +33,6 @@
 
 /******************** notify of new Cert **************************/
 
-#include "util/rswin.h"
-
 #include <openssl/evp.h>
 #include <openssl/x509.h>
 #include <openssl/ssl.h>