database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-21 16:02:15 +03:00
Code Activity

Standardize on __CYGWIN__ rather than __CYGWIN32__ macro. Doesn't matter

Browse Source 
either way (although the former is preferred by the Cygwin folks
themselves), but using only one seems nicer.
This commit is contained in:
Peter Eisentraut
2000-09-29 13:53:35 +00:00
parent 30826ce8e3
commit 2a7da3f564
6 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
contrib/pgbench/pgbench.c
View File

@ -1,5 +1,5 @@
/* /*
* $Header: /cvsroot/pgsql/contrib/pgbench/pgbench.c,v 1.5 2000/07/12 22:58:57 petere Exp $ * $Header: /cvsroot/pgsql/contrib/pgbench/pgbench.c,v 1.6 2000/09/29 13:53:29 petere Exp $
* *
* pgbench: a simple TPC-B like benchmark program for PostgreSQL * pgbench: a simple TPC-B like benchmark program for PostgreSQL
* written by Tatsuo Ishii * written by Tatsuo Ishii
@ -536,7 +536,7 @@ main(int argc, char **argv)
int nsocks; /* return from select(2) */ int nsocks; /* return from select(2) */
int maxsock; /* max socket number to be waited */ int maxsock; /* max socket number to be waited */
#ifndef __CYGWIN32__ #ifndef __CYGWIN__
struct rlimit rlim; struct rlimit rlim;
#endif #endif
@ -576,7 +576,7 @@ main(int argc, char **argv)
fprintf(stderr, "wrong number of clients: %d\n", nclients); fprintf(stderr, "wrong number of clients: %d\n", nclients);
exit(1); exit(1);
} }
#ifndef __CYGWIN32__ #ifndef __CYGWIN__
#ifdef RLIMIT_NOFILE /* most platform uses RLIMIT_NOFILE */ #ifdef RLIMIT_NOFILE /* most platform uses RLIMIT_NOFILE */
if (getrlimit(RLIMIT_NOFILE, &rlim) == -1) if (getrlimit(RLIMIT_NOFILE, &rlim) == -1)
{ {
@ -593,7 +593,7 @@ main(int argc, char **argv)
fprintf(stderr, "Use limit/ulimt to increase the limit before using pgbench.\n"); fprintf(stderr, "Use limit/ulimt to increase the limit before using pgbench.\n");
exit(1); exit(1);
} }
#endif /* #ifndef __CYGWIN32__ */ #endif /* #ifndef __CYGWIN__ */
break; break;
case 's': case 's':
tps = atoi(optarg); tps = atoi(optarg);

4
src/backend/utils/adt/nabstime.c
View File

@ -9,7 +9,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/utils/adt/nabstime.c,v 1.73 2000/07/28 02:13:31 tgl Exp $ * $Header: /cvsroot/pgsql/src/backend/utils/adt/nabstime.c,v 1.74 2000/09/29 13:53:31 petere Exp $
* *
* NOTES * NOTES
* *
@ -166,7 +166,7 @@ GetCurrentAbsoluteTime(void)
CDayLight = tm->tm_isdst; CDayLight = tm->tm_isdst;
CTimeZone = CTimeZone =
#ifdef __CYGWIN32__ #ifdef __CYGWIN__
(tm->tm_isdst ? (_timezone - 3600) : _timezone); (tm->tm_isdst ? (_timezone - 3600) : _timezone);
#else #else
(tm->tm_isdst ? (timezone - 3600) : timezone); (tm->tm_isdst ? (timezone - 3600) : timezone);

8
src/include/c.h
View File

@ -8,7 +8,7 @@
* Portions Copyright (c) 1996-2000, PostgreSQL, Inc * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* $Id: c.h,v 1.81 2000/08/21 17:22:32 tgl Exp $ * $Id: c.h,v 1.82 2000/09/29 13:53:32 petere Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -52,7 +52,7 @@
#include <stddef.h> #include <stddef.h>
#include <stdarg.h> #include <stdarg.h>
#ifdef __CYGWIN32__ #ifdef __CYGWIN__
#include <errno.h> #include <errno.h>
#include <sys/fcntl.h> /* ensure O_BINARY is available */ #include <sys/fcntl.h> /* ensure O_BINARY is available */
#endif #endif
@ -921,7 +921,7 @@ extern char *vararg_format(const char *fmt,...);
* ---------------------------------------------------------------- * ----------------------------------------------------------------
*/ */
#ifdef __CYGWIN32__ #ifdef __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"
@ -942,7 +942,7 @@ extern char *vararg_format(const char *fmt,...);
#define SEP_CHAR '/' #define SEP_CHAR '/'
/* defines for dynamic linking on Win32 platform */ /* defines for dynamic linking on Win32 platform */
#ifdef __CYGWIN32__ #ifdef __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!
#endif #endif

4
src/include/config.h.in
View File

@ -8,7 +8,7 @@
* or in config.h afterwards. Of course, if you edit config.h, then your * or in config.h afterwards. Of course, if you edit config.h, then your
* changes will be overwritten the next time you run configure. * changes will be overwritten the next time you run configure.
* *
* $Id: config.h.in,v 1.135 2000/09/27 15:17:55 petere Exp $ * $Id: config.h.in,v 1.136 2000/09/29 13:53:32 petere Exp $
*/ */
#ifndef CONFIG_H #ifndef CONFIG_H
@ -227,7 +227,7 @@
* Define this is your operating system kernel supports AF_UNIX family * Define this is your operating system kernel supports AF_UNIX family
* sockets. * sockets.
*/ */
#if !defined(__CYGWIN32__) && !defined(__QNX__) #if !defined(__CYGWIN__) && !defined(__QNX__)
# define HAVE_UNIX_SOCKETS 1 # define HAVE_UNIX_SOCKETS 1
#endif #endif

2
src/tools/entab/entab.c
View File

@ -94,7 +94,7 @@ char **argv;
in_file = stdin; in_file = stdin;
else else
{ {
#ifndef __CYGWIN32__ #ifndef __CYGWIN__
if ((in_file = fopen(*argv, "r")) == NULL) if ((in_file = fopen(*argv, "r")) == NULL)
#else #else
if ((in_file = fopen(*argv, "rb")) == NULL) if ((in_file = fopen(*argv, "rb")) == NULL)

8
src/utils/dllinit.c
View File

@ -43,14 +43,14 @@
BOOL APIENTRY DllMain(HINSTANCE hInst, DWORD reason, BOOL APIENTRY DllMain(HINSTANCE hInst, DWORD reason,
LPVOID reserved /* Not used. */ ); LPVOID reserved /* Not used. */ );
#ifdef __CYGWIN32__ #ifdef __CYGWIN__
#include <cygwin/cygwin_dll.h> #include <cygwin/cygwin_dll.h>
DECLARE_CYGWIN_DLL(DllMain); DECLARE_CYGWIN_DLL(DllMain);
/* save hInstance from DllMain */ /* save hInstance from DllMain */
HINSTANCE __hDllInstance_base; HINSTANCE __hDllInstance_base;
#endif /* __CYGWIN32__ */ #endif /* __CYGWIN__ */
struct _reent *_impure_ptr; struct _reent *_impure_ptr;
@ -80,9 +80,9 @@ DllMain(
LPVOID reserved /* Not used. */ ) LPVOID reserved /* Not used. */ )
{ {
#ifdef __CYGWIN32__ #ifdef __CYGWIN__
__hDllInstance_base = hInst; __hDllInstance_base = hInst;
#endif /* __CYGWIN32__ */ #endif /* __CYGWIN__ */
_impure_ptr = __imp_reent_data; _impure_ptr = __imp_reent_data;