------------------------------------------------------------
revno: 12624
revision-id: squid3@treenet.co.nz-20130911011244-vpyp1hf2i8yqip11
parent: squid3@treenet.co.nz-20130911010503-sd3jkptbd24giu85
committer: Amos Jeffries <squid3@treenet.co.nz>
branch nick: 3.3
timestamp: Tue 2013-09-10 19:12:44 -0600
message:
  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.
------------------------------------------------------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: squid3@treenet.co.nz-20130911011244-vpyp1hf2i8yqip11
# target_branch: http://bzr.squid-cache.org/bzr/squid3/3.3
# testament_sha1: 2e7248de0dd0ad9b2207718ac197433965605a8b
# timestamp: 2013-09-11 01:14:44 +0000
# source_branch: http://bzr.squid-cache.org/bzr/squid3/3.3
# base_revision_id: squid3@treenet.co.nz-20130911010503-\
#   sd3jkptbd24giu85
# 
# Begin patch
=== modified file 'compat/cmsg.h'
--- compat/cmsg.h	2012-08-28 13:00:30 +0000
+++ compat/cmsg.h	2013-09-11 01:12:44 +0000
@@ -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_