You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
76 lines
3.3 KiB
76 lines
3.3 KiB
6 years ago
|
diff -ru libunistring-0.9.9.orig/lib/fseterr.c libunistring-0.9.9/lib/fseterr.c
|
||
|
|
--- libunistring-0.9.9.orig/lib/fseterr.c 2018-02-28 17:07:03.000000000 +0100
|
||
|
|
+++ libunistring-0.9.9/lib/fseterr.c 2018-08-15 16:40:53.419266090 +0200
|
||
|
|
@@ -1,20 +1,11 @@
|
||
|
|
/* Set the error indicator of a stream.
|
||
|
|
Copyright (C) 2007-2018 Free Software Foundation, Inc.
|
||
|
|
|
||
|
|
- This program is free software: you can redistribute it and/or
|
||
|
|
- modify it under the terms of either:
|
||
|
|
+ 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.
|
||
|
|
|
||
|
|
- * the GNU Lesser General Public License as published by the Free
|
||
|
|
- Software Foundation; either version 3 of the License, or (at your
|
||
|
|
- option) any later version.
|
||
|
|
-
|
||
|
|
- or
|
||
|
|
-
|
||
|
|
- * the GNU General Public License as published by the Free
|
||
|
|
- Software Foundation; either version 2 of the License, or (at your
|
||
|
|
- option) any later version.
|
||
|
|
-
|
||
|
|
- or both in parallel, as here.
|
||
|
|
This program 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
|
||
|
|
@@ -32,13 +23,17 @@
|
||
|
|
|
||
|
|
#include "stdio-impl.h"
|
||
|
|
|
||
|
|
+/* This file is not used on systems that have the __fseterr function,
|
||
|
|
+ namely musl libc. */
|
||
|
|
+
|
||
|
|
void
|
||
|
|
fseterr (FILE *fp)
|
||
|
|
{
|
||
|
|
/* Most systems provide FILE as a struct and the necessary bitmask in
|
||
|
|
<stdio.h>, because they need it for implementing getc() and putc() as
|
||
|
|
fast macros. */
|
||
|
|
-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
|
||
|
|
+#if defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1
|
||
|
|
+ /* GNU libc, BeOS, Haiku, Linux libc5 */
|
||
|
|
fp->_flags |= _IO_ERR_SEEN;
|
||
|
|
#elif defined __sferror || defined __DragonFly__ || defined __ANDROID__
|
||
|
|
/* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */
|
||
|
|
diff -ru libunistring-0.9.9.orig/lib/fseterr.h libunistring-0.9.9/lib/fseterr.h
|
||
|
|
--- libunistring-0.9.9.orig/lib/fseterr.h 2018-02-28 17:07:03.000000000 +0100
|
||
|
|
+++ libunistring-0.9.9/lib/fseterr.h 2018-08-15 16:40:53.419266090 +0200
|
||
|
|
@@ -1,20 +1,11 @@
|
||
|
|
/* Set the error indicator of a stream.
|
||
|
|
Copyright (C) 2007, 2009-2018 Free Software Foundation, Inc.
|
||
|
|
|
||
|
|
- This program is free software: you can redistribute it and/or
|
||
|
|
- modify it under the terms of either:
|
||
|
|
+ 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.
|
||
|
|
|
||
|
|
- * the GNU Lesser General Public License as published by the Free
|
||
|
|
- Software Foundation; either version 3 of the License, or (at your
|
||
|
|
- option) any later version.
|
||
|
|
-
|
||
|
|
- or
|
||
|
|
-
|
||
|
|
- * the GNU General Public License as published by the Free
|
||
|
|
- Software Foundation; either version 2 of the License, or (at your
|
||
|
|
- option) any later version.
|
||
|
|
-
|
||
|
|
- or both in parallel, as here.
|
||
|
|
This program 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
|