From 52dda5ec05d5c0acfd47644c25068740f67745d4 Mon Sep 17 00:00:00 2001 From: Peter Eisentraut Date: Fri, 29 Sep 2000 13:35:26 +0000 Subject: [PATCH] Cygwin uses _sys_nerr for sys_nerr --- src/backend/utils/error/elog.c | 6 +++++- src/backend/utils/error/exc.c | 16 ++++++++++------ 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/src/backend/utils/error/elog.c b/src/backend/utils/error/elog.c index da8d80763a..60307ff2b5 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.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 index 374aa57216..21a1008f8c 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.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 @@ -16,10 +16,10 @@ * *------------------------------------------------------------------------- */ -#include - #include "postgres.h" +#include + #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 -- GitLab