mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
test.
This commit is contained in:
Peter Eisentraut 2000-10-28 23:53:01 +00:00
parent 0c0a176370
commit 4f82ab4c97
7 changed files with 4 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/backend/utils/error/exc.c
View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * 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 * NOTE
* XXX this code needs improvement--check for state violations and * XXX this code needs improvement--check for state violations and
@ -203,10 +203,6 @@ ExcRaise(Exception *excP,
ExcCurFrameP = efp->link; ExcCurFrameP = efp->link;
#if defined (JMP_BUF)
longjmp(efp->context, 1);
#else
siglongjmp(efp->context, 1); siglongjmp(efp->context, 1);
#endif
} }
} }

1
src/include/port/hpux.h
View File

@ -1,4 +1,3 @@
#define JMP_BUF
#define USE_POSIX_TIME #define USE_POSIX_TIME
#define HAS_TEST_AND_SET #define HAS_TEST_AND_SET
typedef struct typedef struct

1
src/include/port/linux.h
View File

@ -4,7 +4,6 @@
__USE_BSD is set by bsd/signal.h, and __USE_BSD_SIGNAL appears not to __USE_BSD is set by bsd/signal.h, and __USE_BSD_SIGNAL appears not to
be used. be used.
*/ */
#define JMP_BUF
#define USE_POSIX_TIME #define USE_POSIX_TIME
#if defined(__i386__) #if defined(__i386__)

2
src/include/port/nextstep.h
View File

@ -12,9 +12,7 @@ typedef int sigset_t;
#define SIG_BLOCK 00 #define SIG_BLOCK 00
#define SIG_UNBLOCK 01 #define SIG_UNBLOCK 01
#define SIG_SETMASK 02 #define SIG_SETMASK 02
#define NEED_SIG_JMP
#endif #endif
#define JMP_BUF
#define NO_WAITPID #define NO_WAITPID
typedef struct mutex slock_t; typedef struct mutex slock_t;

1
src/include/port/win.h
View File

@ -1,4 +1,3 @@
#define JMP_BUF
#define HAS_TEST_AND_SET #define HAS_TEST_AND_SET
typedef unsigned char slock_t; typedef unsigned char slock_t;

2
src/include/port/win32.h
View File

@ -1,4 +1,2 @@
#define JMP_BUF
#define NEED_SIG_JMP
#define USES_WINSOCK #define USES_WINSOCK
#define NOFILE 100 #define NOFILE 100

15
src/include/utils/exc.h
View File

@ -7,31 +7,22 @@
* Portions Copyright (c) 1996-2000, PostgreSQL, Inc * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
* Portions Copyright (c) 1994, Regents of the University of California * 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 #ifndef EXC_H
#define EXC_H #define EXC_H
#include <setjmp.h>
#include "config.h" #include "config.h"
#include <setjmp.h>
extern char *ExcFileName; extern char *ExcFileName;
extern Index ExcLineNumber; 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; typedef sigjmp_buf ExcContext;
#endif
typedef Exception *ExcId; typedef Exception *ExcId;
typedef long ExcDetail; typedef long ExcDetail;
typedef char *ExcData; typedef char *ExcData;