#define JMP_BUF has been unnecessary since the arrival of the sigsetjmp

test.

7 files changed, 2 insertions, 22 deletions

diff --git a/src/backend/utils/error/exc.c b/src/backend/utils/error/exc.c
index 8d4eb8dd9a..3ceced55a8 100644
--- a/src/backend/utils/error/exc.c
+++ b/src/backend/utils/error/exc.c
@@ -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 4ef01af095..b265d4173f 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 3555aba6d0..366932122c 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 40451da12b..c21594dcad 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 61acdb3e21..f30979fd22 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 59bd010afc..c9bf62784b 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 a5d7c55991..93e6d676d2 100644
--- a/src/include/utils/exc.h
+++ b/src/include/utils/exc.h
@@ -14,24 +14,15 @@
 #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;