mirror/postgresql
2
0
Fork 0
mirror of https://git.postgresql.org/git/postgresql.git synced 2024-12-21 08:29:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix Cygwin defines to be consistent.

Browse Source
This commit is contained in:
Bruce Momjian 2004-09-09 00:59:49 +00:00
parent b70999d0fd
commit f1d1116178
7 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/backend/libpq/be-secure.c
View File

@ -11,7 +11,7 @@
* *
* *
* IDENTIFICATION * 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) * Since the server static private key ($DataDir/server.key)
* will normally be stored unencrypted so that the database * 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 * think of a reasonable check to apply on Windows. (See also the
* data directory permission check in postmaster.c) * 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)) || if (!S_ISREG(buf.st_mode) || (buf.st_mode & (S_IRWXG | S_IRWXO)) ||
buf.st_uid != getuid()) buf.st_uid != getuid())
ereport(FATAL, ereport(FATAL,

4
src/backend/postmaster/postmaster.c
View File

@ -37,7 +37,7 @@
* *
* *
* IDENTIFICATION * 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 * NOTES
* *
@ -976,7 +976,7 @@ checkDataDir(const char *checkdir)
* be proper support for Unix-y file permissions. Need to think of a * be proper support for Unix-y file permissions. Need to think of a
* reasonable check to apply on Windows. * 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)) if (stat_buf.st_mode & (S_IRWXG | S_IRWXO))
ereport(FATAL, ereport(FATAL,
(errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE), (errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),

6
src/include/c.h
View File

@ -12,7 +12,7 @@
* Portions Copyright (c) 1996-2004, PostgreSQL Global Development Group * Portions Copyright (c) 1996-2004, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* $PostgreSQL: pgsql/src/include/c.h,v 1.168 2004/08/29 05:06:55 momjian Exp $ * $PostgreSQL: pgsql/src/include/c.h,v 1.169 2004/09/09 00:59:41 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -68,7 +68,7 @@
#include <sys/types.h> #include <sys/types.h>
#include <errno.h> #include <errno.h>
#if defined(__CYGWIN__) || defined(WIN32) #if defined(WIN32) || defined(__CYGWIN__)
#include <fcntl.h> /* ensure O_BINARY is available */ #include <fcntl.h> /* ensure O_BINARY is available */
#endif #endif
#ifdef HAVE_SUPPORTDEFS_H #ifdef HAVE_SUPPORTDEFS_H
@ -680,7 +680,7 @@ typedef NameData *Name;
* literal control-Z. The other affect is that we see CRLF, but * literal control-Z. The other affect is that we see CRLF, but
* that is OK because we can already handle those cleanly. * that is OK because we can already handle those cleanly.
*/ */
#if defined(__CYGWIN__) || defined(WIN32) #if defined(WIN32) || defined(__CYGWIN__)
#define PG_BINARY O_BINARY #define PG_BINARY O_BINARY
#define PG_BINARY_R "rb" #define PG_BINARY_R "rb"
#define PG_BINARY_W "wb" #define PG_BINARY_W "wb"

4
src/include/port.h
View File

@ -6,7 +6,7 @@
* Portions Copyright (c) 1996-2004, PostgreSQL Global Development Group * Portions Copyright (c) 1996-2004, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* $PostgreSQL: pgsql/src/include/port.h,v 1.59 2004/09/09 00:24:10 momjian Exp $ * $PostgreSQL: pgsql/src/include/port.h,v 1.60 2004/09/09 00:59:41 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -181,7 +181,7 @@ extern int win32_open(const char *, int,...);
#endif #endif
/* Global variable holding time zone information. */ /* Global variable holding time zone information. */
#if !defined(__CYGWIN__) #ifndef __CYGWIN__
#define TIMEZONE_GLOBAL timezone #define TIMEZONE_GLOBAL timezone
#define TZNAME_GLOBAL tzname #define TZNAME_GLOBAL tzname
#else #else

4
src/include/port/win32.h
View File

@ -1,4 +1,4 @@
/* $PostgreSQL: pgsql/src/include/port/win32.h,v 1.31 2004/08/31 11:29:56 momjian Exp $ */ /* $PostgreSQL: pgsql/src/include/port/win32.h,v 1.32 2004/09/09 00:59:44 momjian Exp $ */
/* undefine and redefine after #include */ /* undefine and redefine after #include */
#undef mkdir #undef mkdir
@ -19,7 +19,7 @@
#define USES_WINSOCK #define USES_WINSOCK
/* defines for dynamic linking on Win32 platform */ /* defines for dynamic linking on Win32 platform */
#if defined(__CYGWIN__) || defined(__MINGW32__) #if defined(__MINGW32__) || defined(__CYGWIN__)
#if __GNUC__ && ! defined (__declspec) #if __GNUC__ && ! defined (__declspec)
#error You need egcs 1.1 or newer for compiling! #error You need egcs 1.1 or newer for compiling!

2
src/interfaces/ecpg/include/sqlca.h
View File

@ -2,7 +2,7 @@
#define POSTGRES_SQLCA_H #define POSTGRES_SQLCA_H
#ifndef DLLIMPORT #ifndef DLLIMPORT
#if defined(__CYGWIN__) || defined(WIN32) #if defined(WIN32) || defined(__CYGWIN__)
#define DLLIMPORT __declspec (dllimport) #define DLLIMPORT __declspec (dllimport)
#else #else
#define DLLIMPORT #define DLLIMPORT

6
src/port/dirmod.c
View File

@ -10,7 +10,7 @@
* Win32 (NT, Win2k, XP). replace() doesn't work on Win95/98/Me. * Win32 (NT, Win2k, XP). replace() doesn't work on Win95/98/Me.
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/port/dirmod.c,v 1.22 2004/08/29 05:07:02 momjian Exp $ * $PostgreSQL: pgsql/src/port/dirmod.c,v 1.23 2004/09/09 00:59:49 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -66,14 +66,14 @@ pgrename(const char *from, const char *to)
{ {
int loops = 0; int loops = 0;
#ifdef WIN32 #if defined(WIN32) && !defined(__CYGWIN__)
while (!MoveFileEx(from, to, MOVEFILE_REPLACE_EXISTING)) while (!MoveFileEx(from, to, MOVEFILE_REPLACE_EXISTING))
#endif #endif
#ifdef __CYGWIN__ #ifdef __CYGWIN__
while (rename(from, to) < 0) while (rename(from, to) < 0)
#endif #endif
{ {
#ifdef WIN32 #if defined(WIN32) && !defined(__CYGWIN__)
if (GetLastError() != ERROR_ACCESS_DENIED) if (GetLastError() != ERROR_ACCESS_DENIED)
#endif #endif
#ifdef __CYGWIN__ #ifdef __CYGWIN__