From 061f80e3710b10f1a4704d35b649117c0f84e45f Mon Sep 17 00:00:00 2001
From: Magnus Hagander <magnus@hagander.net>
Date: Thu, 29 Nov 2007 16:44:26 +0000
Subject: Back-patch mingw configure-check for gettimeofday so that 8.2 can be
 built with current versions of mingw.

---
 src/include/pg_config.h.in | 3 +++
 src/include/port.h         | 5 ++++-
 src/include/port/win32.h   | 8 +++++++-
 3 files changed, 14 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/include/pg_config.h.in b/src/include/pg_config.h.in
index 655d0948e17..29d1a0e91d9 100644
--- a/src/include/pg_config.h.in
+++ b/src/include/pg_config.h.in
@@ -167,6 +167,9 @@
 /* Define to 1 if you have the `getrusage' function. */
 #undef HAVE_GETRUSAGE
 
+/* Define to 1 if you have the `gettimeofday' function. */
+#undef HAVE_GETTIMEOFDAY
+
 /* Define to 1 if you have the <history.h> header file. */
 #undef HAVE_HISTORY_H
 
diff --git a/src/include/port.h b/src/include/port.h
index ed06e895eba..9481c66961c 100644
--- a/src/include/port.h
+++ b/src/include/port.h
@@ -6,7 +6,7 @@
  * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/port.h,v 1.106.2.1 2007/01/11 02:40:12 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/port.h,v 1.106.2.2 2007/11/29 16:44:26 mha Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -288,8 +288,11 @@ extern FILE *pgwin32_fopen(const char *, const char *);
 extern long lrand48(void);
 extern void srand48(long seed);
 
+/* New versions of MingW have gettimeofday, old mingw and msvc don't */
+#ifndef HAVE_GETTIMEOFDAY
 /* Last parameter not used */
 extern int	gettimeofday(struct timeval * tp, struct timezone * tzp);
+#endif
 #else							/* !WIN32 */
 
 /*
diff --git a/src/include/port/win32.h b/src/include/port/win32.h
index 535ab0a8bc9..514efcdb2d8 100644
--- a/src/include/port/win32.h
+++ b/src/include/port/win32.h
@@ -1,4 +1,4 @@
-/* $PostgreSQL: pgsql/src/include/port/win32.h,v 1.63.2.2 2007/01/26 20:07:01 tgl Exp $ */
+/* $PostgreSQL: pgsql/src/include/port/win32.h,v 1.63.2.3 2007/11/29 16:44:26 mha Exp $ */
 
 #if defined(_MSC_VER) || defined(__BORLANDC__)
 #define WIN32_ONLY_COMPILER
@@ -156,11 +156,17 @@ int			semop(int semId, struct sembuf * sops, int flag);
 #define SIGUSR2				31
 #endif
 
+/*
+ * New versions of mingw have gettimeofday() and also declare
+ * struct timezone to support it.
+ */
+#ifndef HAVE_GETTIMEOFDAY
 struct timezone
 {
 	int			tz_minuteswest; /* Minutes west of GMT.  */
 	int			tz_dsttime;		/* Nonzero if DST is ever in effect.  */
 };
+#endif
 
 /* for setitimer in backend/port/win32/timer.c */
 #define ITIMER_REAL 0
-- 
cgit v1.2.3