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

petere · petere · commit 4f82ab4c9722 · 2000-10-28T23:53:01.000Z
test.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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;

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $Header: /cvsroot/pgsql/src/backend/utils/error/Attic/exc.c,v 1.31 2000/10/03 03:11:22 momjian Exp $`
	`11`	`+ * $Header: /cvsroot/pgsql/src/backend/utils/error/Attic/exc.c,v 1.32 2000/10/28 23:53:00 petere Exp $`
`12`	`12`	`*`
`13`	`13`	`* NOTE`
`14`	`14`	`* XXX this code needs improvement--check for state violations and`
`@@ -203,10 +203,6 @@ ExcRaise(Exception *excP,`
`203`	`203`
`204`	`204`	`ExcCurFrameP = efp->link;`
`205`	`205`
`206`		`-#if defined (JMP_BUF)`
`207`		`- longjmp(efp->context, 1);`
`208`		`-#else`
`209`	`206`	`siglongjmp(efp->context, 1);`
`210`		`-#endif`
`211`	`207`	`}`
`212`	`208`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-#define JMP_BUF`
`2`	`1`	`#define USE_POSIX_TIME`
`3`	`2`	`#define HAS_TEST_AND_SET`
`4`	`3`	`typedef struct`