diff options
| author | Jörg Frings-Fürst <debian@jff.email> | 2022-01-08 11:53:52 +0100 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff.email> | 2022-01-08 11:53:52 +0100 |
| commit | fa838e76139763f902c7d27cb9e1d393ed6a15e4 (patch) | |
| tree | 7d0ae09775ea950056193eaa2ca93844299d46f1 /tests/fdopen.c | |
| parent | c78359d9542c86b972aac373efcf7bc7a8a560e5 (diff) | |
| parent | 2959e59fab3bab834368adefd90bd4b1b094366b (diff) | |
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'tests/fdopen.c')
| -rw-r--r-- | tests/fdopen.c | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/tests/fdopen.c b/tests/fdopen.c index 669d85df..f1c5dff1 100644 --- a/tests/fdopen.c +++ b/tests/fdopen.c @@ -1,17 +1,17 @@ /* Open a stream with a given file descriptor. - Copyright (C) 2011-2018 Free Software Foundation, Inc. + Copyright (C) 2011-2022 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 - the Free Software Foundation; either version 3 of the License, or - (at your option) any later version. + This file is free software: you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as + published by the Free Software Foundation; either version 2.1 of the + License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, + This file 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. + GNU Lesser General Public License for more details. - You should have received a copy of the GNU General Public License + You should have received a copy of the GNU Lesser General Public License along with this program. If not, see <https://www.gnu.org/licenses/>. */ #include <config.h> @@ -27,7 +27,8 @@ #undef fdopen -#if HAVE_MSVC_INVALID_PARAMETER_HANDLER +#if defined _WIN32 && !defined __CYGWIN__ +# if HAVE_MSVC_INVALID_PARAMETER_HANDLER static FILE * fdopen_nothrow (int fd, const char *mode) { @@ -35,7 +36,7 @@ fdopen_nothrow (int fd, const char *mode) TRY_MSVC_INVAL { - result = fdopen (fd, mode); + result = _fdopen (fd, mode); } CATCH_MSVC_INVAL { @@ -45,6 +46,9 @@ fdopen_nothrow (int fd, const char *mode) return result; } +# else +# define fdopen_nothrow _fdopen +# endif #else # define fdopen_nothrow fdopen #endif |