The macros NULL_DEV and DEVNULL were both used to work around

platform-specific spellings of /dev/null.  But one should be enough, so
settle on DEVNULL.

diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c
index c955e1e..a56892d 100644 (file)
--- a/src/backend/postmaster/postmaster.c
+++ b/src/backend/postmaster/postmaster.c
@@ -37,7 +37,7 @@
  *
  *
  * IDENTIFICATION
- *       $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.566 2008/10/28 12:10:43 mha Exp $
+ *       $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.567 2008/12/11 10:25:17 petere Exp $
  *
  * NOTES
  *
@@ -1181,7 +1181,7 @@ pmdaemonize(void)
                ExitPostmaster(1);
        }
 #endif
-       i = open(NULL_DEV, O_RDWR, 0);
+       i = open(DEVNULL, O_RDWR, 0);
        dup2(i, 0);
        dup2(i, 1);
        dup2(i, 2);

diff --git a/src/backend/postmaster/syslogger.c b/src/backend/postmaster/syslogger.c
index 91bf562..49918e0 100644 (file)
--- a/src/backend/postmaster/syslogger.c
+++ b/src/backend/postmaster/syslogger.c
@@ -18,7 +18,7 @@
  *
  *
  * IDENTIFICATION
- *       $PostgreSQL: pgsql/src/backend/postmaster/syslogger.c,v 1.45 2008/02/17 02:09:27 tgl Exp $
+ *       $PostgreSQL: pgsql/src/backend/postmaster/syslogger.c,v 1.46 2008/12/11 10:25:17 petere Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -184,7 +184,7 @@ SysLoggerMain(int argc, char *argv[])
         */
        if (redirection_done)
        {
-               int                     fd = open(NULL_DEV, O_WRONLY, 0);
+               int                     fd = open(DEVNULL, O_WRONLY, 0);
 
                /*
                 * The closes might look redundant, but they are not: we want to be

diff --git a/src/include/c.h b/src/include/c.h
index 16c30cb..7bcc635 100644 (file)
--- a/src/include/c.h
+++ b/src/include/c.h
@@ -12,7 +12,7 @@
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/c.h,v 1.232 2008/12/11 09:17:07 petere Exp $
+ * $PostgreSQL: pgsql/src/include/c.h,v 1.233 2008/12/11 10:25:17 petere Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -769,9 +769,6 @@ typedef NameData *Name;
 #define PG_BINARY_W "w"
 #endif
 
-/* These are for things that are one way on Unix and another on NT */
-#define NULL_DEV               "/dev/null"
-
 /*
  * Provide prototypes for routines not present in a particular machine's
  * standard C library.