diff options
Diffstat (limited to 'src/pl')
| -rw-r--r-- | src/pl/plpgsql/src/pl_exec.c | 20 | ||||
| -rw-r--r-- | src/pl/tcl/pltcl.c | 20 |
2 files changed, 4 insertions, 36 deletions
diff --git a/src/pl/plpgsql/src/pl_exec.c b/src/pl/plpgsql/src/pl_exec.c index dd31dcd5f8..edb7e381a6 100644 --- a/src/pl/plpgsql/src/pl_exec.c +++ b/src/pl/plpgsql/src/pl_exec.c @@ -3,7 +3,7 @@ * procedural language * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/pl/plpgsql/src/pl_exec.c,v 1.8 1999/03/22 16:45:30 momjian Exp $ + * $Header: /cvsroot/pgsql/src/pl/plpgsql/src/pl_exec.c,v 1.9 1999/04/20 02:19:57 tgl Exp $ * * This software is copyrighted by Jan Wieck - Hamburg. * @@ -55,28 +55,12 @@ #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" -/************************************************************ - * Make Warn_restart from tcop/postgres.c visible for us. - * The longjmp() mechanism of the elog(ERROR,...) makes it - * impossible for us to call exceptions. But at least I - * would like some suggestions about where in the PL function - * the error occured. - * - * It's ugly - Jan - ************************************************************/ -#if defined(nextstep) -#define sigjmp_buf jmp_buf -#define sigsetjmp(x,y) setjmp(x) -#define siglongjmp longjmp -#endif - -extern DLLIMPORT sigjmp_buf Warn_restart; /* in tcop/postgres.c */ - static PLpgSQL_function *error_info_func = NULL; static PLpgSQL_stmt *error_info_stmt = NULL; static char *error_info_text = NULL; 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 **********************************************************************/ |