diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 1999-04-20 02:19:59 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 1999-04-20 02:19:59 +0000 |
| commit | 09c5e84072326c1774bef933c8712906b0f01f85 (patch) | |
| tree | ec9425c92fee8d4b87169a80fe4757f2c4a307be /src/pl/tcl/pltcl.c | |
| parent | d30e2ac306c26271474e1b96c087ff8e6d859ac2 (diff) | |
| download | postgresql-09c5e84072326c1774bef933c8712906b0f01f85.tar.gz | |
Change elog(ERROR) to get back to main loop via a plain sigsetjmp,
instead of doing a kill(self, SIGQUIT) and expecting the signal handler
to do it. Also, clean up inconsistent definitions of the sigjmp buffer
in the several files that already referenced it.
Diffstat (limited to 'src/pl/tcl/pltcl.c')
| -rw-r--r-- | src/pl/tcl/pltcl.c | 20 |
1 files changed, 2 insertions, 18 deletions
diff --git a/src/pl/tcl/pltcl.c b/src/pl/tcl/pltcl.c index c97e17558a..dc11a7111a 100644 --- a/src/pl/tcl/pltcl.c +++ b/src/pl/tcl/pltcl.c @@ -3,7 +3,7 @@ * procedural language (PL) * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/pl/tcl/pltcl.c,v 1.8 1998/11/27 20:05:27 vadim Exp $ + * $Header: /cvsroot/pgsql/src/pl/tcl/pltcl.c,v 1.9 1999/04/20 02:19:59 tgl Exp $ * * This software is copyrighted by Jan Wieck - Hamburg. * @@ -52,6 +52,7 @@ #include "fmgr.h" #include "access/heapam.h" +#include "tcop/tcopprot.h" #include "utils/syscache.h" #include "catalog/pg_proc.h" #include "catalog/pg_type.h" @@ -90,23 +91,6 @@ typedef struct pltcl_query_desc } pltcl_query_desc; -/************************************************************ - * Make Warn_restart from tcop/postgres.c visible for us. - * The longjmp() mechanism of the elog(ERROR,...) restart let's - * interpreter levels lay around. So we must tidy up in that - * case and thus, we have to catch the longjmp's sometimes to - * return though all the interpreter levels back. - * - * It's ugly - Jan - ************************************************************/ -#if defined(nextstep) -#define sigjmp_buf jmp_buf -#define sigsetjmp(x,y) setjmp(x) -#define siglongjmp longjmp -#endif - -extern sigjmp_buf Warn_restart; /* in tcop/postgres.c */ - /********************************************************************** * Global data **********************************************************************/ |