natas_hw
/
paho
mirror of https://github.com/eclipse/paho.mqtt.c
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix VS2010 macro redefinition warnings 

```
ClCompile:
  SSLSocket.c
C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\include\errno.h(43): warning C4005: 'EINTR': macro redefinition
          C:\Projects\paho.mqtt.c\src\Socket.h(31): see previous definition of 'EINTR'
C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\include\errno.h(50): warning C4005: 'EAGAIN': macro redefinition
          C:\Projects\paho.mqtt.c\src\Socket.h(29): see previous definition of 'EAGAIN'
C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\include\errno.h(100): warning C4005: 'ECONNRESET': macro redefinition
          C:\Projects\paho.mqtt.c\src\Socket.h(39): see previous definition of 'ECONNRESET'
C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\include\errno.h(104): warning C4005: 'EINPROGRESS': macro redefinition
          C:\Projects\paho.mqtt.c\src\Socket.h(33): see previous definition of 'EINPROGRESS'
C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\include\errno.h(118): warning C4005: 'ENOTCONN': macro redefinition
          C:\Projects\paho.mqtt.c\src\Socket.h(37): see previous definition of 'ENOTCONN'
C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\include\errno.h(130): warning C4005: 'ETIMEDOUT': macro redefinition
          C:\Projects\paho.mqtt.c\src\Thread.h(35): see previous definition of 'ETIMEDOUT'
C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\include\errno.h(132): warning C4005: 'EWOULDBLOCK': macro redefinition
          C:\Projects\paho.mqtt.c\src\Socket.h(35): see previous definition of 'EWOULDBLOCK'
```

Reason is that VS2010 (implicitly) includes errno.h by inclusion of openssl/err.h, hence after inclusion of Socket.h. Whereas, VS2015 (implicitly) includes errno.h by inclusion of SocketBuffer.h, hence before Socket.h.

Hint: Compilation with `/showIncludes` reveals the inclusion hierarchy.

Signed-off-by: tbeu <tc@tbeu.de>
This commit is contained in:
tbeu 2018-08-29 14:00:26 +02:00
parent 469ad50603
commit 6bc3ec63bd
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/Socket.h
View File

@ -21,6 +21,7 @@
#include <sys/types.h>
#if defined(WIN32) || defined(WIN64)
#include <errno.h>
#include <winsock2.h>
#include <ws2tcpip.h>
#define MAXHOSTNAMELEN 256