diff options
author | Peter Eisentraut | 2000-09-29 13:53:35 +0000 |
---|---|---|
committer | Peter Eisentraut | 2000-09-29 13:53:35 +0000 |
commit | b54818d5700c8af45d6459e6e718610aaeb0579c (patch) | |
tree | 6caf36037d0b30379e8ff4d5693f5b79e4fe4837 | |
parent | 56979b630ca18c4f36bb0ff947a1a555ccea74ab (diff) |
Standardize on __CYGWIN__ rather than __CYGWIN32__ macro. Doesn't matter
either way (although the former is preferred by the Cygwin folks
themselves), but using only one seems nicer.
-rw-r--r-- | contrib/pgbench/pgbench.c | 6 | ||||
-rw-r--r-- | src/backend/utils/adt/nabstime.c | 2 | ||||
-rw-r--r-- | src/include/c.h | 6 | ||||
-rw-r--r-- | src/include/config.h.in | 2 | ||||
-rw-r--r-- | src/tools/entab/entab.c | 2 | ||||
-rw-r--r-- | src/utils/dllinit.c | 8 |
6 files changed, 13 insertions, 13 deletions
diff --git a/contrib/pgbench/pgbench.c b/contrib/pgbench/pgbench.c index 747aec5de2..92ca924b7a 100644 --- a/contrib/pgbench/pgbench.c +++ b/contrib/pgbench/pgbench.c @@ -536,7 +536,7 @@ main(int argc, char **argv) int nsocks; /* return from select(2) */ int maxsock; /* max socket number to be waited */ -#ifndef __CYGWIN32__ +#ifndef __CYGWIN__ struct rlimit rlim; #endif @@ -576,7 +576,7 @@ main(int argc, char **argv) fprintf(stderr, "wrong number of clients: %d\n", nclients); exit(1); } -#ifndef __CYGWIN32__ +#ifndef __CYGWIN__ #ifdef RLIMIT_NOFILE /* most platform uses RLIMIT_NOFILE */ 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"); exit(1); } -#endif /* #ifndef __CYGWIN32__ */ +#endif /* #ifndef __CYGWIN__ */ break; case 's': tps = atoi(optarg); diff --git a/src/backend/utils/adt/nabstime.c b/src/backend/utils/adt/nabstime.c index 42532c8d40..7faf0ca0f8 100644 --- a/src/backend/utils/adt/nabstime.c +++ b/src/backend/utils/adt/nabstime.c @@ -166,7 +166,7 @@ GetCurrentAbsoluteTime(void) CDayLight = tm->tm_isdst; CTimeZone = -#ifdef __CYGWIN32__ +#ifdef __CYGWIN__ (tm->tm_isdst ? (_timezone - 3600) : _timezone); #else (tm->tm_isdst ? (timezone - 3600) : timezone); diff --git a/src/include/c.h b/src/include/c.h index e6435fd75f..8892cdbd47 100644 --- a/src/include/c.h +++ b/src/include/c.h @@ -52,7 +52,7 @@ #include <stddef.h> #include <stdarg.h> -#ifdef __CYGWIN32__ +#ifdef __CYGWIN__ #include <errno.h> #include <sys/fcntl.h> /* ensure O_BINARY is available */ #endif @@ -921,7 +921,7 @@ extern char *vararg_format(const char *fmt,...); * ---------------------------------------------------------------- */ -#ifdef __CYGWIN32__ +#ifdef __CYGWIN__ #define PG_BINARY O_BINARY #define PG_BINARY_R "rb" #define PG_BINARY_W "wb" @@ -942,7 +942,7 @@ extern char *vararg_format(const char *fmt,...); #define SEP_CHAR '/' /* defines for dynamic linking on Win32 platform */ -#ifdef __CYGWIN32__ +#ifdef __CYGWIN__ #if __GNUC__ && ! defined (__declspec) #error You need egcs 1.1 or newer for compiling! #endif diff --git a/src/include/config.h.in b/src/include/config.h.in index 9c556329bc..f9c1075d15 100644 --- a/src/include/config.h.in +++ b/src/include/config.h.in @@ -227,7 +227,7 @@ * Define this is your operating system kernel supports AF_UNIX family * sockets. */ -#if !defined(__CYGWIN32__) && !defined(__QNX__) +#if !defined(__CYGWIN__) && !defined(__QNX__) # define HAVE_UNIX_SOCKETS 1 #endif diff --git a/src/tools/entab/entab.c b/src/tools/entab/entab.c index b0019b30b2..0ed1e52069 100644 --- a/src/tools/entab/entab.c +++ b/src/tools/entab/entab.c @@ -94,7 +94,7 @@ char **argv; in_file = stdin; else { -#ifndef __CYGWIN32__ +#ifndef __CYGWIN__ if ((in_file = fopen(*argv, "r")) == NULL) #else if ((in_file = fopen(*argv, "rb")) == NULL) diff --git a/src/utils/dllinit.c b/src/utils/dllinit.c index 3e8fb861a0..06fbdccc82 100644 --- a/src/utils/dllinit.c +++ b/src/utils/dllinit.c @@ -43,14 +43,14 @@ BOOL APIENTRY DllMain(HINSTANCE hInst, DWORD reason, LPVOID reserved /* Not used. */ ); -#ifdef __CYGWIN32__ +#ifdef __CYGWIN__ #include <cygwin/cygwin_dll.h> DECLARE_CYGWIN_DLL(DllMain); /* save hInstance from DllMain */ HINSTANCE __hDllInstance_base; -#endif /* __CYGWIN32__ */ +#endif /* __CYGWIN__ */ struct _reent *_impure_ptr; @@ -80,9 +80,9 @@ DllMain( LPVOID reserved /* Not used. */ ) { -#ifdef __CYGWIN32__ +#ifdef __CYGWIN__ __hDllInstance_base = hInst; -#endif /* __CYGWIN32__ */ +#endif /* __CYGWIN__ */ _impure_ptr = __imp_reent_data; |