Windows: MinGW provides truncate()/ftruncate()

diff --git a/compat/mswin.cc b/compat/mswin.cc
index 4cae8cfbf50f727c1b8febc0e6f6af663cbe9b47..c50f7092b8e583ad023214995d1a0596b5e9008f 100644 (file)
--- a/compat/mswin.cc
+++ b/compat/mswin.cc
@@ -236,6 +236,7 @@ statfs(const char *path, struct statfs *sfs)
     return 0;
 }
 
+#if !_SQUID_MINGW_
 int
 WIN32_ftruncate(int fd, off_t size)
 {
@@ -283,6 +284,7 @@ WIN32_truncate(const char *pathname, off_t length)
 
     return res;
 }
+#endif /* !_SQUID_MINGW_ */
 
 struct passwd *
 getpwnam(char *unused) {

diff --git a/compat/os/mswin.h b/compat/os/mswin.h
index 6561b41f94ee0f6bba2cdcbb4d0522038c80d8bc..ad685ea5543e5af5ec3eb42fd0a065d6934a326f 100644 (file)
--- a/compat/os/mswin.h
+++ b/compat/os/mswin.h
@@ -90,7 +90,12 @@ typedef unsigned long ino_t;
 #define fileno _fileno
 #define fstat _fstati64
 #endif
+#if !defined(_SQUID_MINGW_) // MinGW defines these properly
+SQUIDCEXTERN int WIN32_ftruncate(int fd, off_t size);
 #define ftruncate WIN32_ftruncate
+SQUIDCEXTERN int WIN32_truncate(const char *pathname, off_t length);
+#define truncate WIN32_truncate
+#endif
 #define getcwd _getcwd
 #define getpid _getpid
 #define getrusage WIN32_getrusage
@@ -115,7 +120,6 @@ typedef unsigned long ino_t;
 #define strncasecmp _strnicmp
 #define tempnam _tempnam
 #endif
-#define truncate WIN32_truncate
 #define umask _umask
 #define unlink _unlink
 #if defined(_MSC_VER) /* Microsoft C Compiler ONLY */

diff --git a/include/util.h b/include/util.h
index 43cd026158083c05bf77915b43f2907c1d686a6d..d97198bfb4321ec6e3d92d7b51fac85b784cdae6 100644 (file)
--- a/include/util.h
+++ b/include/util.h
@@ -115,13 +115,11 @@ SQUIDCEXTERN unsigned int RoundTo(const unsigned int num, const unsigned int wha
 /* win32lib.c */
 #if _SQUID_MSWIN_
 SQUIDCEXTERN int chroot (const char *);
-SQUIDCEXTERN int ftruncate(int, off_t);
 #if !HAVE_GETTIMEOFDAY
 SQUIDCEXTERN int gettimeofday(struct timeval * ,void *);
 #endif
 SQUIDCEXTERN int kill(pid_t, int);
 SQUIDCEXTERN int statfs(const char *, struct statfs *);
-SQUIDCEXTERN int truncate(const char *, off_t);
 SQUIDCEXTERN struct passwd *getpwnam(char *);
 SQUIDCEXTERN struct group *getgrnam(char *);
 SQUIDCEXTERN uid_t geteuid(void);