diff options
| author | Alexander Smirnov <alex@ydb.tech> | 2024-07-08 15:54:05 +0000 |
|---|---|---|
| committer | Alexander Smirnov <alex@ydb.tech> | 2024-07-08 15:54:05 +0000 |
| commit | fc7be18c76af2e700641f3598c4856baeef1428e (patch) | |
| tree | 11dbca45eb321c3a4dd08b12152acc6ef5dd3fa9 /contrib/tools/bison/lib/raise.c | |
| parent | ec0e7ed6da6fb317741fd8468602949a1362eca5 (diff) | |
| parent | c92cb9d3a19331916f0c274d80e67f02a62caa9b (diff) | |
| download | ydb-fc7be18c76af2e700641f3598c4856baeef1428e.tar.gz | |
Merge branch 'rightlib' into mergelibs-240708-1553
Diffstat (limited to 'contrib/tools/bison/lib/raise.c')
| -rw-r--r-- | contrib/tools/bison/lib/raise.c | 56 |
1 files changed, 30 insertions, 26 deletions
diff --git a/contrib/tools/bison/lib/raise.c b/contrib/tools/bison/lib/raise.c index 5b546d2b8d..e750b7a4c6 100644 --- a/contrib/tools/bison/lib/raise.c +++ b/contrib/tools/bison/lib/raise.c @@ -1,6 +1,6 @@ /* Provide a non-threads replacement for the POSIX raise function. - Copyright (C) 2002-2003, 2005-2006, 2009-2013 Free Software Foundation, Inc. + Copyright (C) 2002-2003, 2005-2006, 2009-2019 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -13,7 +13,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. */ + along with this program. If not, see <https://www.gnu.org/licenses/>. */ /* written by Jim Meyering and Bruno Haible */ @@ -27,29 +27,13 @@ # include <errno.h> -# include "msvc-inval.h" - -# undef raise - # if HAVE_MSVC_INVALID_PARAMETER_HANDLER -static int -raise_nothrow (int sig) -{ - int result; - - TRY_MSVC_INVAL - { - result = raise (sig); - } - CATCH_MSVC_INVAL - { - result = -1; - errno = EINVAL; - } - DONE_MSVC_INVAL; +# include "msvc-inval.h" +# endif - return result; -} +# if HAVE_MSVC_INVALID_PARAMETER_HANDLER +/* Forward declaration. */ +static int raise_nothrow (int sig); # else # define raise_nothrow raise # endif @@ -59,12 +43,11 @@ raise_nothrow (int sig) # include <unistd.h> -# define rpl_raise raise - #endif int -rpl_raise (int sig) +raise (int sig) +#undef raise { #if GNULIB_defined_signal_blocking && GNULIB_defined_SIGPIPE if (sig == SIGPIPE) @@ -77,3 +60,24 @@ rpl_raise (int sig) return kill (getpid (), sig); #endif } + +#if HAVE_RAISE && HAVE_MSVC_INVALID_PARAMETER_HANDLER +static int +raise_nothrow (int sig) +{ + int result; + + TRY_MSVC_INVAL + { + result = raise (sig); + } + CATCH_MSVC_INVAL + { + result = -1; + errno = EINVAL; + } + DONE_MSVC_INVAL; + + return result; +} +#endif |