Import readline 7.0 (patch 5)

[deliverable/binutils-gdb.git] / readline / posixjmp.h

diff --git a/readline/posixjmp.h b/readline/posixjmp.h
index b52aa00332b66881b88d793207e9865a05d7ed32..9c7e99ed42f01bb85482e7933a4d8431c9b313cb 100644 (file)
--- a/readline/posixjmp.h
+++ b/readline/posixjmp.h
@@ -1,22 +1,22 @@
 /* posixjmp.h -- wrapper for setjmp.h with changes for POSIX systems. */
 
-/* Copyright (C) 1987,1991 Free Software Foundation, Inc.
+/* Copyright (C) 1987,1991-2015 Free Software Foundation, Inc.
 
    This file is part of GNU Bash, the Bourne Again SHell.
 
-   Bash is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   Bash is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
-   Bash is distributed in the hope that it will be useful, but WITHOUT
-   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public
-   License for more details.
+   Bash is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with Bash; see the file COPYING.  If not, write to the Free
-   Software Foundation, 59 Temple Place, Suite 330, Boston, MA 02111 USA. */
+   along with Bash.  If not, see <http://www.gnu.org/licenses/>.
+*/
 
 #ifndef _POSIXJMP_H_
 #define _POSIXJMP_H_
@@ -27,14 +27,20 @@
 
 #if defined (HAVE_POSIX_SIGSETJMP)
 #  define procenv_t    sigjmp_buf
-#  if !defined (__OPENNT)
-#    undef setjmp
-#    define setjmp(x)  sigsetjmp((x), 1)
-#    undef longjmp
-#    define longjmp(x, n)      siglongjmp((x), (n))
-#  endif /* !__OPENNT */
+
+#  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))
 #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_ */