Windows: locate CMSG definitions in Winsock2.h when present

Windows defines the CMSG macros in Winsock2.h sometimes. This allows the
definitions there to be used when present and avoids compiler errors
about double definitions.

  This is an iCelero project.

diff --git a/compat/cmsg.h b/compat/cmsg.h
index 17d63be04a5801ccef7e993bc16b40e2c8e9987f..dc340e3703ea4627ff39ee0993d4159a013572a4 100644 (file)
--- a/compat/cmsg.h
+++ b/compat/cmsg.h
@@ -9,6 +9,12 @@
 #include <sys/socket.h>
 #endif
 
+// WinSock2.h defines these for Windows
+#if HAVE_WINSOCK2_H
+#include <winsock2.h>
+#define CMSG_H_ // prevent re-definition
+#endif
+
 #ifndef CMSG_H_
 #define CMSG_H_