diff options
| author | Bruce Momjian <bruce@momjian.us> | 1999-01-17 06:20:06 +0000 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 1999-01-17 06:20:06 +0000 |
| commit | 7a6b562fdf60f1d1ebe9e2bc154d0ffd56dab2d1 (patch) | |
| tree | 1e24049a7bedd03a13776dc131e808ae97eca197 /src/backend/utils/misc | |
| parent | 298682d9e0b0ec55d5f72cec1f4d43c23f2a1ac6 (diff) | |
| download | postgresql-7a6b562fdf60f1d1ebe9e2bc154d0ffd56dab2d1.tar.gz postgresql-7a6b562fdf60f1d1ebe9e2bc154d0ffd56dab2d1.zip | |
Apply Win32 patch from Horak Daniel.
Diffstat (limited to 'src/backend/utils/misc')
| -rw-r--r-- | src/backend/utils/misc/database.c | 6 | ||||
| -rw-r--r-- | src/backend/utils/misc/trace.c | 4 |
2 files changed, 9 insertions, 1 deletions
diff --git a/src/backend/utils/misc/database.c b/src/backend/utils/misc/database.c index 60f6499872e..dadf6a8173c 100644 --- a/src/backend/utils/misc/database.c +++ b/src/backend/utils/misc/database.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/misc/Attic/database.c,v 1.21 1998/11/27 19:52:29 vadim Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/misc/Attic/database.c,v 1.22 1999/01/17 06:18:58 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -198,7 +198,11 @@ GetRawDatabaseInfo(char *name, int4 *owner, Oid *db_id, char *path, int *encodin sprintf(dbfname, "%s%cpg_database", DataDir, SEP_CHAR); fileflags = O_RDONLY; +#ifndef __CYGWIN32__ if ((dbfd = open(dbfname, O_RDONLY, 0)) < 0) +#else + if ((dbfd = open(dbfname, O_RDONLY | O_BINARY, 0)) < 0) +#endif elog(FATAL, "Cannot open %s", dbfname); pfree(dbfname); diff --git a/src/backend/utils/misc/trace.c b/src/backend/utils/misc/trace.c index def34162f24..1ac48bc82d7 100644 --- a/src/backend/utils/misc/trace.c +++ b/src/backend/utils/misc/trace.c @@ -345,7 +345,11 @@ read_pg_options(SIGNAL_ARGS) } snprintf(buffer, BUF_SIZE - 1, "%s/%s", DataDir, "pg_options"); +#ifndef __CYGWIN32__ if ((fd = open(buffer, O_RDONLY)) < 0) +#else + if ((fd = open(buffer, O_RDONLY | O_BINARY)) < 0) +#endif return; if ((n = read(fd, buffer, BUF_SIZE - 1)) > 0) |