diff options
| author | Magnus Hagander <magnus@hagander.net> | 2007-10-29 11:25:42 +0000 |
|---|---|---|
| committer | Magnus Hagander <magnus@hagander.net> | 2007-10-29 11:25:42 +0000 |
| commit | 6f14effbf9ce702614ee49cb36e1b31ead3fae45 (patch) | |
| tree | dbbbcc19cb390b2865730c41c76ac9d382e3ebf4 /src | |
| parent | f9e83a558855e79d6f08e00e97d93e0828ad9b61 (diff) | |
| download | postgresql-6f14effbf9ce702614ee49cb36e1b31ead3fae45.tar.gz postgresql-6f14effbf9ce702614ee49cb36e1b31ead3fae45.zip | |
New versions of mingw have gettimeofday(), so add an autoconf test
for this.
Diffstat (limited to 'src')
| -rw-r--r-- | src/include/pg_config.h.in | 3 | ||||
| -rw-r--r-- | src/include/port.h | 5 | ||||
| -rw-r--r-- | src/include/port/win32.h | 8 |
3 files changed, 14 insertions, 2 deletions
diff --git a/src/include/pg_config.h.in b/src/include/pg_config.h.in index 52ac6ca60b2..570472e13f4 100644 --- a/src/include/pg_config.h.in +++ b/src/include/pg_config.h.in @@ -175,6 +175,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 <gssapi/gssapi.h> header file. */ #undef HAVE_GSSAPI_GSSAPI_H diff --git a/src/include/port.h b/src/include/port.h index 2e46f7cdbc6..ef83c1f2dcd 100644 --- a/src/include/port.h +++ b/src/include/port.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/port.h,v 1.113 2007/09/28 22:25:49 tgl Exp $ + * $PostgreSQL: pgsql/src/include/port.h,v 1.114 2007/10/29 11:25:42 mha Exp $ * *------------------------------------------------------------------------- */ @@ -296,8 +296,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 234efe23b58..aa6da62f731 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.77 2007/10/26 21:50:10 mha Exp $ */ +/* $PostgreSQL: pgsql/src/include/port/win32.h,v 1.78 2007/10/29 11:25:42 mha Exp $ */ #if defined(_MSC_VER) || defined(__BORLANDC__) #define WIN32_ONLY_COMPILER @@ -167,11 +167,17 @@ #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 |