Cygwin uses _sys_nerr for sys_nerr

petere · petere · commit 52dda5ec05d5 · 2000-09-29T13:35:26.000Z
diff --git 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.61 2000/06/28 03:32:27 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/error/elog.c,v 1.62 2000/09/29 13:35:26 petere Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -38,6 +38,10 @@
 #include "commands/copy.h"
 
 extern int	errno;
+
+#ifdef __CYGWIN__
+# define sys_nerr _sys_nerr
+#endif
 extern int	sys_nerr;
 
 extern CommandDest whereToSendOutput;
diff --git a/src/backend/utils/error/exc.c b/src/backend/utils/error/exc.c
@@ -8,18 +8,18 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/error/Attic/exc.c,v 1.29 2000/01/26 05:57:20 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/error/Attic/exc.c,v 1.30 2000/09/29 13:35:26 petere Exp $
  *
  * NOTE
  *	  XXX this code needs improvement--check for state violations and
  *	  XXX reset after handling an exception.
  *
  *-------------------------------------------------------------------------
  */
-#include <errno.h>
-
 #include "postgres.h"
 
+#include <errno.h>
+
 #include "storage/ipc.h"
 #include "utils/exc.h"
 
@@ -94,15 +94,19 @@ EnableExceptionHandling(bool on)
 	ExceptionHandlingEnabled = on;
 }
 
+
+extern int	errno;
+#ifdef __CYGWIN__
+# define sys_nerr _sys_nerr
+#endif
+extern int	sys_nerr;
+
 static void
 ExcPrint(Exception *excP,
 		 ExcDetail detail,
 		 ExcData data,
 		 ExcMessage message)
 {
-	extern int	errno;
-	extern int	sys_nerr;
-
 #ifdef	lint
 	data = data;
 #endif

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $Header: /cvsroot/pgsql/src/backend/utils/error/elog.c,v 1.61 2000/06/28 03:32:27 tgl Exp $`
	`11`	`+ * $Header: /cvsroot/pgsql/src/backend/utils/error/elog.c,v 1.62 2000/09/29 13:35:26 petere Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -38,6 +38,10 @@`
`38`	`38`	`#include "commands/copy.h"`
`39`	`39`
`40`	`40`	`extern int errno;`
	`41`	`+`
	`42`	`+#ifdef __CYGWIN__`
	`43`	`+# define sys_nerr _sys_nerr`
	`44`	`+#endif`
`41`	`45`	`extern int sys_nerr;`
`42`	`46`
`43`	`47`	`extern CommandDest whereToSendOutput;`