diff --git a/src/backend/bootstrap/bootstrap.c b/src/backend/bootstrap/bootstrap.c
index f66366ca3a..2c4f810495 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.14 1997/01/14 08:04:42 bryanh Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/bootstrap/bootstrap.c,v 1.15 1997/01/24 22:42:30 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -191,7 +191,7 @@ static char     *values[MAXATTR];       /* cooresponding attribute values */
 int             numattr;                /* number of attributes for cur. rel */
 extern int    fsyncOff;                 /* do not fsync the database */
 
-#ifdef NEED_SIG_JMP
+#ifndef HAVE_SIGSETJMP
 static jmp_buf    Warn_restart;
 #define sigsetjmp(x,y)  setjmp(x)
 #define siglongjmp longjmp
diff --git a/src/include/config.h b/src/include/config.h
index 6559c645c2..a921421132 100644
--- a/src/include/config.h
+++ b/src/include/config.h
@@ -11,6 +11,7 @@
 #define HAVE_VALUES_H
 #define HAVE_MEMMOVE
 #define HAVE_TERMIOS_H
+#define HAVE_SIGSETJMP
 
 #if defined(aix)
 #  undef HAVE_TERMIOS_H
@@ -143,7 +144,7 @@
 #  define NO_SIGACTION
 #  define NO_SETSID
 #  define NO_SIGPROCMASK
-#  define NEED_SIG_JMP
+#  undef HAVE_SIGSETJMP
 # endif
 
 # define HAVE_LIMITS_H
@@ -189,7 +190,7 @@ typedef unsigned char slock_t;
 
 #if defined(win32)
 #  define JMP_BUF
-#  define NEED_SIG_JMP
+#  undef HAVE_SIGSETJMP
 #  define NO_UNISTD_H
 #  define USES_WINSOCK 
 #  define NOFILE	100