------------------------------------------------------------
revno: 13660
revision-id: squid3@treenet.co.nz-20141113080356-o2pftaav0xctkgpr
parent: squid3@treenet.co.nz-20141113080305-28jq6ulz41wt9mmc
committer: Amos Jeffries <squid3@treenet.co.nz>
branch nick: 3.5
timestamp: Thu 2014-11-13 00:03:56 -0800
message:
  Cygwin: FOPEN may be defined
------------------------------------------------------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: squid3@treenet.co.nz-20141113080356-o2pftaav0xctkgpr
# target_branch: http://bzr.squid-cache.org/bzr/squid3/3.5
# testament_sha1: 295a02f3b5704c2bb8ba3edf39bf39f4608ffb5d
# timestamp: 2014-11-13 08:04:44 +0000
# source_branch: http://bzr.squid-cache.org/bzr/squid3/3.5
# base_revision_id: squid3@treenet.co.nz-20141113080305-\
#   28jq6ulz41wt9mmc
# 
# Begin patch
=== modified file 'compat/os/mswindows.h'
--- compat/os/mswindows.h	2014-10-02 17:50:47 +0000
+++ compat/os/mswindows.h	2014-11-13 08:03:56 +0000
@@ -414,7 +414,9 @@
 #define _pioinfo(i) ( __pioinfo[(i) >> IOINFO_L2E] + ((i) & (IOINFO_ARRAY_ELTS - 1)) )
 #define _osfile(i)  ( _pioinfo(i)->osfile )
 #define _osfhnd(i)  ( _pioinfo(i)->osfhnd )
+#if !defined(FOPEN)
 #define FOPEN           0x01    /* file handle open */
+#endif
 
 #if defined(_MSC_VER)
 SQUIDCEXTERN _CRTIMP ioinfo * __pioinfo[];