Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 4f82ab4

Browse files
committed
#define JMP_BUF has been unnecessary since the arrival of the sigsetjmp
test.
1 parent 0c0a176 commit 4f82ab4

File tree

7 files changed

+4
-24
lines changed

7 files changed

+4
-24
lines changed

src/backend/utils/error/exc.c

+1-5
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* 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 $
1212
*
1313
* NOTE
1414
* XXX this code needs improvement--check for state violations and
@@ -203,10 +203,6 @@ ExcRaise(Exception *excP,
203203

204204
ExcCurFrameP = efp->link;
205205

206-
#if defined (JMP_BUF)
207-
longjmp(efp->context, 1);
208-
#else
209206
siglongjmp(efp->context, 1);
210-
#endif
211207
}
212208
}

src/include/port/hpux.h

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
#define JMP_BUF
21
#define USE_POSIX_TIME
32
#define HAS_TEST_AND_SET
43
typedef struct

src/include/port/linux.h

-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
__USE_BSD is set by bsd/signal.h, and __USE_BSD_SIGNAL appears not to
55
be used.
66
*/
7-
#define JMP_BUF
87
#define USE_POSIX_TIME
98

109
#if defined(__i386__)

src/include/port/nextstep.h

-2
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,7 @@ typedef int sigset_t;
1212
#define SIG_BLOCK 00
1313
#define SIG_UNBLOCK 01
1414
#define SIG_SETMASK 02
15-
#define NEED_SIG_JMP
1615
#endif
1716

18-
#define JMP_BUF
1917
#define NO_WAITPID
2018
typedef struct mutex slock_t;

src/include/port/win.h

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
#define JMP_BUF
21
#define HAS_TEST_AND_SET
32
typedef unsigned char slock_t;
43

src/include/port/win32.h

-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,2 @@
1-
#define JMP_BUF
2-
#define NEED_SIG_JMP
31
#define USES_WINSOCK
42
#define NOFILE 100

src/include/utils/exc.h

+3-12
Original file line numberDiff line numberDiff line change
@@ -7,31 +7,22 @@
77
* Portions Copyright (c) 1996-2000, PostgreSQL, Inc
88
* Portions Copyright (c) 1994, Regents of the University of California
99
*
10-
* $Id: exc.h,v 1.16 2000/01/26 05:58:38 momjian Exp $
10+
* $Id: exc.h,v 1.17 2000/10/28 23:53:01 petere Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
1414
#ifndef EXC_H
1515
#define EXC_H
1616

17-
#include <setjmp.h>
18-
1917
#include "config.h"
2018

19+
#include <setjmp.h>
20+
2121
extern char *ExcFileName;
2222
extern Index ExcLineNumber;
2323

24-
/*
25-
* ExcMessage and Exception are now defined in c.h
26-
*/
27-
#if defined(JMP_BUF)
28-
typedef jmp_buf ExcContext;
29-
30-
#else
3124
typedef sigjmp_buf ExcContext;
3225

33-
#endif
34-
3526
typedef Exception *ExcId;
3627
typedef long ExcDetail;
3728
typedef char *ExcData;

0 commit comments

Comments
 (0)