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/dbase/fimonitor.cc

@@ -23,6 +23,7 @@
 
 #ifdef WINDOWS_SYS
 #include "util/rsstring.h"
+#include "util/rswin.h"
 #endif
 
 #include "dbase/fimonitor.h"

libretroshare/src/ft/ftfileprovider.cc

@@ -1,3 +1,7 @@
+#ifdef WINDOWS_SYS
+#include "util/rswin.h"
+#endif // WINDOWS_SYS
+
 #include "ftfileprovider.h"
 #include "ftchunkmap.h"
 
@@ -5,10 +9,6 @@
 #include <stdlib.h>
 #include <stdio.h>
 
-#ifdef WINDOWS_SYS
-#include "util/rswin.h"
-#endif // WINDOWS_SYS
-
 /********
 * #define DEBUG_FT_FILE_PROVIDER 1
 * #define DEBUG_TRANSFERS	 1 // TO GET TIMESTAMPS of DATA READING 

libretroshare/src/pgp/pgphandler.cc

@@ -8,6 +8,7 @@
 
 #ifdef WINDOWS_SYS
 #include "util/rsstring.h"
+#include "util/rswin.h"
 #endif
 
 extern "C" {

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>

libretroshare/src/rsserver/rsinit.cc

@@ -28,9 +28,11 @@
 
 #include <unistd.h>
 
-// for locking instances
 #ifndef WINDOWS_SYS
+// for locking instances
 #include <errno.h>
+#else
+#include "util/rswin.h"
 #endif
 
 #include "util/rsdebug.h"

libretroshare/src/tcponudp/tou.h

@@ -40,10 +40,8 @@
 	#include <netinet/in.h>
 
 #else
-	#include "util/rswin.h"
 	#include <stdint.h>
 	#include <winsock2.h>
-	#include <ws2tcpip.h>
 	#include <stdio.h>
 //	#include <stdint.h>
 	typedef int socklen_t;

libretroshare/src/tcponudp/udpstunner.h

@@ -25,10 +25,6 @@
  *
  */
 
-#ifdef WINDOWS_SYS
-#include "util/rswin.h"
-#endif
-
 #ifndef WINDOWS_SYS
 #include <netinet/in.h>
 #endif

libretroshare/src/util/folderiterator.h

@@ -6,7 +6,6 @@
 #include <cstdio>
 
 #ifdef WINDOWS_SYS
-    #include "util/rswin.h"
     #include <windows.h>
     #include <tchar.h>
     #include <stdio.h>

libretroshare/src/util/rsnet.h

@@ -44,10 +44,8 @@
 
 #else
 
-#include "util/rswin.h"
 
 #include <winsock2.h>
-#include <ws2tcpip.h>
 
 #include <stdio.h> /* for ssize_t */
 //typedef uint32_t socklen_t;

libretroshare/src/util/rsthreads.h

@@ -27,10 +27,6 @@
  */
 
 
-#ifdef WINDOWS_SYS
-#include "util/rswin.h"
-#endif
-
 #include <pthread.h>
 #include <inttypes.h>
 #include <string>