6 files changed, 14 insertions, 23 deletions
diff --git a/src/backend/utils/error/elog.c b/src/backend/utils/error/elog.c
index 6a9ef98f97a..b47a628cb1b 100644
--- a/src/backend/utils/error/elog.c
+++ b/src/backend/utils/error/elog.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/error/elog.c,v 1.74 2000/12/18 00:44:47 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/error/elog.c,v 1.75 2001/01/09 18:40:14 petere Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -44,11 +44,6 @@
 
 extern int	errno;
 
-#ifdef __CYGWIN__
-# define sys_nerr _sys_nerr
-#endif
-extern int	sys_nerr;
-
 extern CommandDest whereToSendOutput;
 
 #ifdef ENABLE_SYSLOG
@@ -140,8 +135,7 @@ elog(int lev, const char *fmt, ...)
 	if (lev <= DEBUG && Debugfile < 0)
 		return;					/* ignore debug msgs if noplace to send */
 
-/* BeOS doesn't have sys_nerr and should be able to use strerror()... */
-#ifndef __BEOS__
+#ifdef HAVE_SYS_NERR
 	/* save errno string for %m */
 	if (errno < sys_nerr && errno >= 0)
 		errorstr = strerror(errno);
@@ -152,7 +146,7 @@ elog(int lev, const char *fmt, ...)
 	}
 #else
     errorstr = strerror(errno);
-#endif /* __BEOS__ */
+#endif
 
 	if (lev == ERROR || lev == FATAL)
 	{
diff --git a/src/backend/utils/error/exc.c b/src/backend/utils/error/exc.c
index 069e63c35bc..16faf93530b 100644
--- a/src/backend/utils/error/exc.c
+++ b/src/backend/utils/error/exc.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/error/Attic/exc.c,v 1.32 2000/10/28 23:53:00 petere Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/error/Attic/exc.c,v 1.33 2001/01/09 18:40:14 petere Exp $
  *
  * NOTE
  *	  XXX this code needs improvement--check for state violations and
@@ -96,10 +96,6 @@ EnableExceptionHandling(bool on)
 
 
 extern int	errno;
-#ifdef __CYGWIN__
-# define sys_nerr _sys_nerr
-#endif
-extern int	sys_nerr;
 
 static void
 ExcPrint(Exception *excP,
@@ -131,7 +127,7 @@ ExcPrint(Exception *excP,
 
 	fprintf(stderr, " (%ld)", detail);
 
-#ifndef __BEOS__
+#ifdef HAVE_SYS_NERR
 	if (errno > 0 && errno < sys_nerr)
 #else
     if (errno > 0)
diff --git a/src/include/c.h b/src/include/c.h
index 4f31cf2ecb9..4e5c7ff95f1 100644
--- 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.86 2001/01/09 16:07:14 momjian Exp $
+ * $Id: c.h,v 1.87 2001/01/09 18:40:15 petere Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -993,6 +993,10 @@ extern int	vsnprintf(char *str, size_t count, const char *fmt, va_list args);
 #include <regex/utils.h>
 #endif
 
+#ifdef HAVE_SYS_NERR
+extern int sys_nerr;
+#endif
+
 /* ----------------
  *		end of c.h
  * ----------------
diff --git a/src/include/config.h.in b/src/include/config.h.in
index 8be472c3fec..debd934672f 100644
--- 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.154 2000/12/27 23:59:14 tgl Exp $
+ * $Id: config.h.in,v 1.155 2001/01/09 18:40:15 petere Exp $
  */
 
 #ifndef CONFIG_H
@@ -617,6 +617,9 @@ extern void srandom(unsigned int seed);
 /* Define if you have the optreset variable */
 #undef HAVE_INT_OPTRESET
 
+/* Define if you have the sys_nerr global variable */
+#undef HAVE_SYS_NERR
+
 /* Define if you have strtoll() */
 #undef HAVE_STRTOLL
 
diff --git a/src/include/port/beos.h b/src/include/port/beos.h
index 38a8eaa79e4..58cb5eb485a 100644
--- a/src/include/port/beos.h
+++ b/src/include/port/beos.h
@@ -7,9 +7,6 @@ typedef unsigned char slock_t;
 
 #define AF_UNIX     10 /* no domain sockets on BeOS */
 
-/* Beos doesn't have sysnerr but strerror should works on every error */
-extern int sys_nerr;
-
 /* Beos doesn't have all the required getrusage fields */
 #undef HAVE_GETRUSAGE
 
diff --git a/src/include/port/win.h b/src/include/port/win.h
index bae6de53f64..91b1b1e6d69 100644
--- a/src/include/port/win.h
+++ b/src/include/port/win.h
@@ -9,6 +9,3 @@ typedef unsigned char slock_t;
 #define HAVE_INT_TIMEZONE		/* has int _timezone */
 
 #include <cygwin/version.h>
-#if (CYGWIN_VERSION_API_MAJOR >= 0) && (CYGWIN_VERSION_API_MINOR >= 8)
-#define sys_nerr _sys_nerr
-#endif