diff options
| author | Bruce Momjian <bruce@momjian.us> | 2006-06-07 22:24:46 +0000 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 2006-06-07 22:24:46 +0000 |
| commit | 399a36a75d2d06bfdb91402713d408271b4833ba (patch) | |
| tree | b8391f6bda4680d37ac430c3270c67bde979d842 /src/backend/utils | |
| parent | 877e296306a2017a18fc7086e9742c8ee3e0a665 (diff) | |
| download | postgresql-399a36a75d2d06bfdb91402713d408271b4833ba.tar.gz postgresql-399a36a75d2d06bfdb91402713d408271b4833ba.zip | |
Prepare code to be built by MSVC:
o remove many WIN32_CLIENT_ONLY defines
o add WIN32_ONLY_COMPILER define
o add 3rd argument to open() for portability
o add include/port/win32_msvc directory for
system includes
Magnus Hagander
Diffstat (limited to 'src/backend/utils')
| -rw-r--r-- | src/backend/utils/adt/float.c | 10 | ||||
| -rw-r--r-- | src/backend/utils/fmgr/dfmgr.c | 6 | ||||
| -rw-r--r-- | src/backend/utils/mb/encnames.c | 4 |
3 files changed, 15 insertions, 5 deletions
diff --git a/src/backend/utils/adt/float.c b/src/backend/utils/adt/float.c index b5147c9aa45..132e6a11e45 100644 --- a/src/backend/utils/adt/float.c +++ b/src/backend/utils/adt/float.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/adt/float.c,v 1.124 2006/04/24 20:36:32 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/utils/adt/float.c,v 1.125 2006/06/07 22:24:44 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -80,6 +80,14 @@ #define HAVE_FINITE 1 #endif +/* Visual C++ etc lacks NAN, and won't accept 0.0/0.0. NAN definition from + * http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vclang/html/vclrfNotNumberNANItems.asp + */ +#if defined(WIN32) && !defined(NAN) +static const uint32 nan[2] = {0xffffffff, 0x7fffffff}; +#define NAN (*(const double *) nan) +#endif + /* not sure what the following should be, but better to make it over-sufficient */ #define MAXFLOATWIDTH 64 #define MAXDOUBLEWIDTH 128 diff --git a/src/backend/utils/fmgr/dfmgr.c b/src/backend/utils/fmgr/dfmgr.c index 0aacf2be995..4c50e421e57 100644 --- a/src/backend/utils/fmgr/dfmgr.c +++ b/src/backend/utils/fmgr/dfmgr.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/fmgr/dfmgr.c,v 1.85 2006/05/31 20:58:09 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/utils/fmgr/dfmgr.c,v 1.86 2006/06/07 22:24:44 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -16,7 +16,11 @@ #include <sys/stat.h> +#ifndef WIN32_ONLY_COMPILER #include "dynloader.h" +#else +#include "port/dynloader/win32.h" +#endif #include "miscadmin.h" #include "utils/dynamic_loader.h" diff --git a/src/backend/utils/mb/encnames.c b/src/backend/utils/mb/encnames.c index f628fcd679e..3760bd78cfe 100644 --- a/src/backend/utils/mb/encnames.c +++ b/src/backend/utils/mb/encnames.c @@ -2,7 +2,7 @@ * Encoding names and routines for work with it. All * in this file is shared bedween FE and BE. * - * $PostgreSQL: pgsql/src/backend/utils/mb/encnames.c,v 1.29 2006/02/18 16:15:22 petere Exp $ + * $PostgreSQL: pgsql/src/backend/utils/mb/encnames.c,v 1.30 2006/06/07 22:24:44 momjian Exp $ */ #ifdef FRONTEND #include "postgres_fe.h" @@ -13,9 +13,7 @@ #include "utils/builtins.h" #endif -#ifndef WIN32_CLIENT_ONLY #include <unistd.h> -#endif #include "mb/pg_wchar.h" #include <ctype.h> |