[myserver-commit] [3085] Check if headers are available before inclusion.

[Giuseppe Scrivano]

Revision: 3085
          http://svn.sv.gnu.org/viewvc/?view=rev&root=myserver&revision=3085
Author:   gscrivano
Date:     2009-05-17 18:28:22 +0000 (Sun, 17 May 2009)
Log Message:
-----------
Check if headers are available before inclusion.  It solves a compiling issue 
under Windows.

Modified Paths:
--------------
    trunk/myserver/src/base/ssl/ssl.cpp
    trunk/myserver/tests/test_socket.cpp
    trunk/myserver/tests/test_ssl_socket.cpp

Modified: trunk/myserver/src/base/ssl/ssl.cpp
===================================================================
--- trunk/myserver/src/base/ssl/ssl.cpp 2009-05-14 19:11:06 UTC (rev 3084)
+++ trunk/myserver/src/base/ssl/ssl.cpp 2009-05-17 18:28:22 UTC (rev 3085)
@@ -30,7 +30,9 @@
 
 #endif
 
+#ifdef HAVE_PTHREAD
 #include <pthread.h>
+#endif
 }
 
 SslContext::SslContext()

Modified: trunk/myserver/tests/test_socket.cpp
===================================================================
--- trunk/myserver/tests/test_socket.cpp        2009-05-14 19:11:06 UTC (rev 
3084)
+++ trunk/myserver/tests/test_socket.cpp        2009-05-17 18:28:22 UTC (rev 
3085)
@@ -23,10 +23,15 @@
 #include "../include/base/socket/socket.h"
 #include "../include/base/thread/thread.h"
 
+extern "C"
+{
 #include <string.h>
+#ifndef WIN32
 #include <errno.h>
 #include <arpa/inet.h>
+#endif
 #include <iostream>
+}
 
 using namespace std;
 

Modified: trunk/myserver/tests/test_ssl_socket.cpp
===================================================================
--- trunk/myserver/tests/test_ssl_socket.cpp    2009-05-14 19:11:06 UTC (rev 
3084)
+++ trunk/myserver/tests/test_ssl_socket.cpp    2009-05-17 18:28:22 UTC (rev 
3085)
@@ -28,11 +28,15 @@
 #include "../include/base/file/files_utility.h"
 #include "../include/base/thread/thread.h"
 
+extern "C"
+{
 #include <string.h>
+#ifndef WIN32
 #include <errno.h>
 #include <arpa/inet.h>
+#endif
 #include <iostream>
-
+}
 using namespace std;