diff options
| author | Patrick Palka <patrick@parcs.ath.cx> | 2015-07-25 15:41:05 -0400 |
|---|---|---|
| committer | Patrick Palka <patrick@parcs.ath.cx> | 2015-07-25 15:57:00 -0400 |
| commit | 5836a818eccb180d75c92ce4c861abb6fe8dec23 (patch) | |
| tree | 624044ca5df5a6c192e47933a735ab4fe9aaea71 /readline/posixjmp.h | |
| parent | b8cc7b2e9afab37eb9a7cff0d3ae4ebbcf7d494f (diff) | |
| download | fsf-binutils-gdb-5836a818eccb180d75c92ce4c861abb6fe8dec23.zip fsf-binutils-gdb-5836a818eccb180d75c92ce4c861abb6fe8dec23.tar.gz fsf-binutils-gdb-5836a818eccb180d75c92ce4c861abb6fe8dec23.tar.bz2 | |
Revert "Sync readline/ to version 7.0 alpha"
This reverts commit b558ff043d41ba8d17a82f5f9ae5f9dade66160e.
This reverts commit 4a11f2065906976675808364ddbd1c0f77eea41f.
The initial import commit failed to retain local changes made to
readline's configure.in (and the commit message erroneously stated that
there were no local changes that needed to be reapplied). Also the
import caused a couple of build errors and a scattering of testsuite
regressions throughout many arches. It's probably better to start over
with this import, hopefully more carefully next time.
Diffstat (limited to 'readline/posixjmp.h')
| -rw-r--r-- | readline/posixjmp.h | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/readline/posixjmp.h b/readline/posixjmp.h index 9c7e99e..49bfecf 100644 --- a/readline/posixjmp.h +++ b/readline/posixjmp.h @@ -1,6 +1,6 @@ /* posixjmp.h -- wrapper for setjmp.h with changes for POSIX systems. */ -/* Copyright (C) 1987,1991-2015 Free Software Foundation, Inc. +/* Copyright (C) 1987,1991 Free Software Foundation, Inc. This file is part of GNU Bash, the Bourne Again SHell. @@ -27,20 +27,14 @@ #if defined (HAVE_POSIX_SIGSETJMP) # define procenv_t sigjmp_buf - -# define setjmp_nosigs(x) sigsetjmp((x), 0) -# define setjmp_sigs(x) sigsetjmp((x), 1) - -# define _rl_longjmp(x, n) siglongjmp((x), (n)) -# define sh_longjmp(x, n) siglongjmp((x), (n)) +# if !defined (__OPENNT) +# undef setjmp +# define setjmp(x) sigsetjmp((x), 1) +# undef longjmp +# define longjmp(x, n) siglongjmp((x), (n)) +# endif /* !__OPENNT */ #else # define procenv_t jmp_buf - -# define setjmp_nosigs setjmp -# define setjmp_sigs setjmp - -# define _rl_longjmp(x, n) longjmp((x), (n)) -# define sh_longjmp(x, n) longjmp((x), (n)) #endif #endif /* _POSIXJMP_H_ */ |