diff options
| author | Bruce Momjian <bruce@momjian.us> | 2004-09-09 00:59:49 +0000 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 2004-09-09 00:59:49 +0000 |
| commit | f1d11161780670174e1363e3962ed006a89f19fc (patch) | |
| tree | 3c5fe0926049b428891f347084b734029b97c2e9 /src/backend | |
| parent | b70999d0fd9a43288842f27b10cf317144ac9ff1 (diff) | |
| download | postgresql-f1d11161780670174e1363e3962ed006a89f19fc.tar.gz postgresql-f1d11161780670174e1363e3962ed006a89f19fc.zip | |
Fix Cygwin defines to be consistent.
Diffstat (limited to 'src/backend')
| -rw-r--r-- | src/backend/libpq/be-secure.c | 4 | ||||
| -rw-r--r-- | src/backend/postmaster/postmaster.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/backend/libpq/be-secure.c b/src/backend/libpq/be-secure.c index aaa9647551a..4bd7581a38f 100644 --- a/src/backend/libpq/be-secure.c +++ b/src/backend/libpq/be-secure.c @@ -11,7 +11,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/libpq/be-secure.c,v 1.48 2004/08/29 05:06:43 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/libpq/be-secure.c,v 1.49 2004/09/09 00:59:31 momjian Exp $ * * Since the server static private key ($DataDir/server.key) * will normally be stored unencrypted so that the database @@ -659,7 +659,7 @@ initialize_SSL(void) * think of a reasonable check to apply on Windows. (See also the * data directory permission check in postmaster.c) */ -#if !defined(__CYGWIN__) && !defined(WIN32) +#if !defined(WIN32) && !defined(__CYGWIN__) if (!S_ISREG(buf.st_mode) || (buf.st_mode & (S_IRWXG | S_IRWXO)) || buf.st_uid != getuid()) ereport(FATAL, diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c index 52dc12f0ee8..c329c12d25d 100644 --- a/src/backend/postmaster/postmaster.c +++ b/src/backend/postmaster/postmaster.c @@ -37,7 +37,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.424 2004/08/29 05:06:46 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.425 2004/09/09 00:59:33 momjian Exp $ * * NOTES * @@ -976,7 +976,7 @@ checkDataDir(const char *checkdir) * be proper support for Unix-y file permissions. Need to think of a * reasonable check to apply on Windows. */ -#if !defined(__CYGWIN__) && !defined(WIN32) +#if !defined(WIN32) && !defined(__CYGWIN__) if (stat_buf.st_mode & (S_IRWXG | S_IRWXO)) ereport(FATAL, (errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE), |