--------------------- PatchSet 1160 Date: 2005/01/01 21:40:50 Author: serassio Branch: nt Tag: (none) Log: MinGW fixes Members: port/win32/include/squid-mswin.h:1.3.18.14->1.3.18.15 src/Makefile.am:1.26.2.37->1.26.2.38 Index: squid3/port/win32/include/squid-mswin.h =================================================================== RCS file: /cvsroot/squid-sf//squid3/port/win32/include/Attic/squid-mswin.h,v retrieving revision 1.3.18.14 retrieving revision 1.3.18.15 diff -u -r1.3.18.14 -r1.3.18.15 --- squid3/port/win32/include/squid-mswin.h 1 Jan 2005 11:14:53 -0000 1.3.18.14 +++ squid3/port/win32/include/squid-mswin.h 1 Jan 2005 21:40:50 -0000 1.3.18.15 @@ -1,5 +1,5 @@ /* - * $Id: squid-mswin.h,v 1.3.18.14 2005/01/01 11:14:53 serassio Exp $ + * $Id: squid-mswin.h,v 1.3.18.15 2005/01/01 21:40:50 serassio Exp $ * * AUTHOR: Guido Serassio & Andrey Shorin * @@ -320,12 +320,13 @@ return _close(fd); } - +#if defined(_MSC_VER) /* Microsoft C Compiler ONLY */ inline int open(const char *filename, int oflag, int pmode = 0) { return _open(filename, oflag, pmode ); } +#endif inline int read(int fd, void * buf, size_t siz) Index: squid3/src/Makefile.am =================================================================== RCS file: /cvsroot/squid-sf//squid3/src/Makefile.am,v retrieving revision 1.26.2.37 retrieving revision 1.26.2.38 diff -u -r1.26.2.37 -r1.26.2.38 --- squid3/src/Makefile.am 1 Jan 2005 18:55:28 -0000 1.26.2.37 +++ squid3/src/Makefile.am 1 Jan 2005 21:40:51 -0000 1.26.2.38 @@ -1,7 +1,7 @@ # # Makefile for the Squid Object Cache server # -# $Id: Makefile.am,v 1.26.2.37 2005/01/01 18:55:28 serassio Exp $ +# $Id: Makefile.am,v 1.26.2.38 2005/01/01 21:40:51 serassio Exp $ # # Uncomment and customize the following to suit your needs: # @@ -225,7 +225,8 @@ DiskIO/WinAIO/WinAIODiskIOModule.cc \ DiskIO/Blocking/BlockingDiskIOModule.cc \ DiskIO/DiskDaemon/DiskDaemonDiskIOModule.cc \ - DiskIO/DiskThreads/DiskThreadsDiskIOModule.cc + DiskIO/DiskThreads/DiskThreadsDiskIOModule.cc \ + DiskIO/WinDiskThreads/WinDiskThreadsDiskIOModule.cc all_AUTHMODULES = \ auth/basic/basicScheme.cc \