diff --git a/src/backend/utils/error/exc.c b/src/backend/utils/error/exc.c
index 0f1d834f92acf709cb5445a45161f28d0ceff12c..069e63c35bc5c0b1a75b18fb499a748452ebe6c1 100644
--- a/src/backend/utils/error/exc.c
+++ b/src/backend/utils/error/exc.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/error/Attic/exc.c,v 1.31 2000/10/03 03:11:22 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/error/Attic/exc.c,v 1.32 2000/10/28 23:53:00 petere Exp $
  *
  * NOTE
  *	  XXX this code needs improvement--check for state violations and
@@ -203,10 +203,6 @@ ExcRaise(Exception *excP,
 
 		ExcCurFrameP = efp->link;
 
-#if defined (JMP_BUF)
-		longjmp(efp->context, 1);
-#else
 		siglongjmp(efp->context, 1);
-#endif
 	}
 }
diff --git a/src/include/port/hpux.h b/src/include/port/hpux.h
index 4ef01af095854bb88a6449ffd064e537f066d635..b265d4173f46c9cedec8503ba022ce6a86ad5026 100644
--- a/src/include/port/hpux.h
+++ b/src/include/port/hpux.h
@@ -1,4 +1,3 @@
-#define JMP_BUF
 #define USE_POSIX_TIME
 #define HAS_TEST_AND_SET
 typedef struct
diff --git a/src/include/port/linux.h b/src/include/port/linux.h
index 3555aba6d04ba325fa1e60dace83b264657da40f..366932122c5001f80c6a5255f17ae5d1e7facddd 100644
--- a/src/include/port/linux.h
+++ b/src/include/port/linux.h
@@ -4,7 +4,6 @@
    __USE_BSD is set by bsd/signal.h, and __USE_BSD_SIGNAL appears not to
    be used.
 */
-#define JMP_BUF
 #define USE_POSIX_TIME
 
 #if defined(__i386__)
diff --git a/src/include/port/nextstep.h b/src/include/port/nextstep.h
index 40451da12b2bb5aca29056928deb3302f4121575..c21594dcadb24c088fcf453e7cc58f09cd7d750d 100644
--- a/src/include/port/nextstep.h
+++ b/src/include/port/nextstep.h
@@ -12,9 +12,7 @@ typedef int sigset_t;
 #define SIG_BLOCK	  00
 #define SIG_UNBLOCK   01
 #define SIG_SETMASK   02
-#define NEED_SIG_JMP
 #endif
 
-#define JMP_BUF
 #define NO_WAITPID
 typedef struct mutex slock_t;
diff --git a/src/include/port/win.h b/src/include/port/win.h
index 61acdb3e21e75b05e9b53eac13f2891896b6db3a..f30979fd2213ea1cc9bc0e5aa0aab41b59cf3ff3 100644
--- a/src/include/port/win.h
+++ b/src/include/port/win.h
@@ -1,4 +1,3 @@
-#define JMP_BUF
 #define HAS_TEST_AND_SET
 typedef unsigned char slock_t;
 
diff --git a/src/include/port/win32.h b/src/include/port/win32.h
index 59bd010afc829cd2f3fa1d040168ce3fa23d14f5..c9bf62784be9ce399d98bc5f0f7ba57c18138893 100644
--- a/src/include/port/win32.h
+++ b/src/include/port/win32.h
@@ -1,4 +1,2 @@
-#define JMP_BUF
-#define NEED_SIG_JMP
 #define USES_WINSOCK
 #define NOFILE		  100
diff --git a/src/include/utils/exc.h b/src/include/utils/exc.h
index 566e3bdc5ab359a3e004a9d9ad40a5fc55eb0834..8b2fc4723a9fdec7aed1d7e8e760e3abfe54971d 100644
--- a/src/include/utils/exc.h
+++ b/src/include/utils/exc.h
@@ -7,31 +7,22 @@
  * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: exc.h,v 1.16 2000/01/26 05:58:38 momjian Exp $
+ * $Id: exc.h,v 1.17 2000/10/28 23:53:01 petere Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef EXC_H
 #define EXC_H
 
-#include <setjmp.h>
-
 #include "config.h"
 
+#include <setjmp.h>
+
 extern char *ExcFileName;
 extern Index ExcLineNumber;
 
-/*
- * ExcMessage and Exception are now defined in c.h
- */
-#if defined(JMP_BUF)
-typedef jmp_buf ExcContext;
-
-#else
 typedef sigjmp_buf ExcContext;
 
-#endif
-
 typedef Exception *ExcId;
 typedef long ExcDetail;
 typedef char *ExcData;