diff --git a/src/backend/bootstrap/bootstrap.c b/src/backend/bootstrap/bootstrap.c
index 0e0c071db82394255dadadb938c22e8f74eafdf7..e620b3fdbac56d9d03bf3f8e1ad3293229c8d5c2 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.29 1997/11/24 05:08:01 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/bootstrap/bootstrap.c,v 1.30 1998/01/01 05:40:28 thomas Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -199,14 +199,20 @@ static char *values[MAXATTR];	/* cooresponding attribute values */
 int			numattr;			/* number of attributes for cur. rel */
 extern int	fsyncOff;			/* do not fsync the database */
 
-#ifndef HAVE_SIGSETJMP
-static jmp_buf Warn_restart;
+/* 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;