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 a8b0b0450678bab337dab8899a4bece75c644b6e..6b9e3edd2010fe9979f7e5cd4964ceb6cd7c4841 100644 (file)
--- a/contrib/pgbench/pgbench.c
+++ b/contrib/pgbench/pgbench.c
@@ -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
  * written by Tatsuo Ishii
@@ -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 dee675f83003d764f61a38fb1d80a171946ac8d4..61973c46cf2bfd01f2cc56565438782c330e6afb 100644 (file)
--- a/src/backend/utils/adt/nabstime.c
+++ b/src/backend/utils/adt/nabstime.c
@@ -9,7 +9,7 @@
  *
  *
  * 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
  *
@@ -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 8bdb40a58a799feefae732778272701b03723b0d..a11106df8c872750c95a260d3d63f14922a2283d 100644 (file)
--- a/src/include/c.h
+++ b/src/include/c.h
@@ -8,7 +8,7 @@
  * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
  * 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 
 #include 
 
-#ifdef __CYGWIN32__
+#ifdef __CYGWIN__
 #include 
 #include      /* 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 ad5dd91f04fa562df030ef966be03bbcd18d12e3..05228d18ba0579f119d72f8bd44cea64e9fa5dd6 100644 (file)
--- a/src/include/config.h.in
+++ b/src/include/config.h.in
@@ -8,7 +8,7 @@
  * or in config.h afterwards.  Of course, if you edit config.h, then your
  * 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
@@ -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 
 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;