aboutsummaryrefslogtreecommitdiff
path: root/src/backend/bootstrap/bootstrap.c
diff options
context:
space:
mode:
authorTom Lane <tgl@sss.pgh.pa.us>1999-04-20 02:19:59 +0000
committerTom Lane <tgl@sss.pgh.pa.us>1999-04-20 02:19:59 +0000
commit09c5e84072326c1774bef933c8712906b0f01f85 (patch)
treeec9425c92fee8d4b87169a80fe4757f2c4a307be /src/backend/bootstrap/bootstrap.c
parentd30e2ac306c26271474e1b96c087ff8e6d859ac2 (diff)
downloadpostgresql-09c5e84072326c1774bef933c8712906b0f01f85.tar.gz
postgresql-09c5e84072326c1774bef933c8712906b0f01f85.zip
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/backend/bootstrap/bootstrap.c')
-rw-r--r--src/backend/bootstrap/bootstrap.c20
1 files changed, 1 insertions, 19 deletions
diff --git a/src/backend/bootstrap/bootstrap.c b/src/backend/bootstrap/bootstrap.c
index c4cb0df1c56..0c377d267c8 100644
--- a/src/backend/bootstrap/bootstrap.c
+++ b/src/backend/bootstrap/bootstrap.c
@@ -7,7 +7,7 @@
* Copyright (c) 1994, Regents of the University of California
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/bootstrap/bootstrap.c,v 1.57 1999/03/25 03:49:25 tgl Exp $
+ * $Header: /cvsroot/pgsql/src/backend/bootstrap/bootstrap.c,v 1.58 1999/04/20 02:19:53 tgl Exp $
*
*-------------------------------------------------------------------------
*/
@@ -184,24 +184,6 @@ static char *values[MAXATTR]; /* cooresponding attribute values */
int numattr; /* number of attributes for cur. rel */
extern bool disableFsync; /* do not fsync the database */
-/* The test for HAVE_SIGSETJMP fails on Linux 2.0.x because the test
- * explicitly disallows sigsetjmp being a #define, which is how it
- * is declared in Linux. So, to avoid compiler warnings about
- * sigsetjmp() being redefined, let's not redefine unless necessary.
- * - thomas 1997-12-27
- */
-
-#if !defined(HAVE_SIGSETJMP) && !defined(sigsetjmp)
-static jmp_buf Warn_restart;
-
-#define sigsetjmp(x,y) setjmp(x)
-#define siglongjmp longjmp
-
-#else
-static sigjmp_buf Warn_restart;
-
-#endif
-
int DebugMode;
static GlobalMemory nogc = (GlobalMemory) NULL; /* special no-gc mem
* context */