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.

diff --git a/contrib/pgbench/pgbench.c b/contrib/pgbench/pgbench.c
index 747aec5de2d3355b120d8c4688eeccb2b628400e..92ca924b7ad6afd85c37c71e11b719caf80c4128 100644 (file)
--- 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 42532c8d40bee41530724fc1aed9137e543eac6b..7faf0ca0f8040cd93ff333ee18c85e391600b7a1 100644 (file)
--- 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 e6435fd75f1b8426f55f9118de46a02d29d83bac..8892cdbd473ad07dea40087a73ece12af26183b2 100644 (file)
--- 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 9c556329bc83abcbfde9ef5a31f2ba50caaaeec5..f9c1075d15a0b2bdabb9dcb5f7d433ca6807b782 100644 (file)
--- 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 b0019b30b2ae820b2ef9cd57ceb719adec9abb51..0ed1e520691661fa36b7dd44e96ccded2af760c6 100644 (file)
--- 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 3e8fb861a0efeea41cb6ce32436679a488609da0..06fbdccc82538c49784450273bf896bb6c875802 100644 (file)
--- 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;