Fix compile warnings

src/MQTTAsync.h

@@ -15,7 +15,7 @@
 
 /**
  * @mainpage Asynchronous MQTT client library for C
- * © Copyright IBM Corp. 2009, 2013
+ * © Copyright IBM Corp. 2009, 2013 and made available under the EPL v1.0
  * 
  * @brief An Asynchronous MQTT client library for C.
  *

src/MQTTClient.h

@@ -13,7 +13,7 @@
 
 /**
  * @mainpage MQTT Client library for C
- * © Copyright IBM Corp. 2009, 2013
+ * © Copyright IBM Corp. 2009, 2013 and made available under the EPL v1.0
  * 
  * @brief An MQTT client library in C.
  *

src/SSLSocket.c

@@ -18,19 +18,18 @@
 
 #if defined(OPENSSL)
 
-#include "SocketBuffer.h"
-#include "MQTTClient.h"
+
+#include <openssl/err.h>
+
+#include "Socket.h"
 #include "SSLSocket.h"
+#include "SocketBuffer.h"
+
 #include "Log.h"
 #include "StackTrace.h"
-#include "Socket.h"
 
 #include "Heap.h"
 
-#include <openssl/ssl.h>
-#include <openssl/err.h>
-#include <openssl/crypto.h>
-
 extern Sockets s;
 
 void SSLSocket_addPendingRead(int sock);

src/Socket.h

@@ -20,6 +20,15 @@
 #include <winsock2.h>
 #include <ws2tcpip.h>
 #define MAXHOSTNAMELEN 256
+
+/* undefine TCP constants which are defined (differently) in <openssl/err.h> */
+#undef EAGAIN 
+#undef EINTR 
+#undef EINPROGRESS
+#undef EWOULDBLOCK 
+#undef ENOTCONN
+#undef ECONNRESET
+
 #define EAGAIN WSAEWOULDBLOCK
 #define EINTR WSAEINTR
 #define EINPROGRESS WSAEINPROGRESS