pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/devel/idutils/patches patch fflush.c and fseeko.c so t...
details: https://anonhg.NetBSD.org/pkgsrc/rev/d234713c70cc
branches: trunk
changeset: 371055:d234713c70cc
user: agc <agc%pkgsrc.org@localhost>
date: Thu Nov 02 04:26:21 2017 +0000
description:
patch fflush.c and fseeko.c so that this package builds on FreeBSD HEAD
diffstat:
devel/idutils/patches/patch-lib_fflush_c | 13 +++++++++++--
devel/idutils/patches/patch-lib_fseeko_c | 13 +++++++++++--
2 files changed, 22 insertions(+), 4 deletions(-)
diffs (54 lines):
diff -r 23b2ad94503e -r d234713c70cc devel/idutils/patches/patch-lib_fflush_c
--- a/devel/idutils/patches/patch-lib_fflush_c Wed Nov 01 21:51:21 2017 +0000
+++ b/devel/idutils/patches/patch-lib_fflush_c Thu Nov 02 04:26:21 2017 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-lib_fflush_c,v 1.1 2014/12/15 11:35:42 mef Exp $
+$NetBSD: patch-lib_fflush_c,v 1.2 2017/11/02 04:26:21 agc Exp $
fflush.c:108:16: error: incompatible types when assigning to type '__off_t' from type 'fpos_t'
fp_->_offset = u.f;
@@ -6,7 +6,16 @@
--- lib/fflush.c.orig 2012-01-29 01:22:33.000000000 +0900
+++ lib/fflush.c 2014-11-20 23:50:41.000000000 +0900
-@@ -105,7 +105,7 @@ update_fpos_cache (FILE *fp, off_t pos)
+@@ -91,7 +91,7 @@
+ update_fpos_cache (FILE *fp, off_t pos)
+ {
+ #if defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD, DragonFly, MacOS X, Cygwin */
+-# if defined __CYGWIN__
++# if defined(__CYGWIN__) || defined(__FreeBSD__)
+ /* fp_->_offset is typed as an integer. */
+ fp_->_offset = pos;
+ # else
+@@ -105,7 +105,7 @@
off_t o;
} u;
u.o = pos;
diff -r 23b2ad94503e -r d234713c70cc devel/idutils/patches/patch-lib_fseeko_c
--- a/devel/idutils/patches/patch-lib_fseeko_c Wed Nov 01 21:51:21 2017 +0000
+++ b/devel/idutils/patches/patch-lib_fseeko_c Thu Nov 02 04:26:21 2017 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-lib_fseeko_c,v 1.1 2014/12/15 11:35:42 mef Exp $
+$NetBSD: patch-lib_fseeko_c,v 1.2 2017/11/02 04:26:21 agc Exp $
fseeko.c:127:22: error: incompatible types when assigning to type '__off_t' from type 'fpos_t'
fp_->_offset = u.f;
@@ -6,7 +6,16 @@
--- lib/fseeko.c~ 2012-01-29 01:26:04.000000000 +0900
+++ lib/fseeko.c 2014-11-20 23:51:55.000000000 +0900
-@@ -124,7 +124,7 @@ fseeko (FILE *fp, off_t offset, int when
+@@ -109,7 +109,7 @@
+ fp->_flags &= ~_IO_EOF_SEEN;
+ fp->_offset = pos;
+ #elif defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD, DragonFly, MacOS X, Cygwin */
+-# if defined __CYGWIN__
++# if defined(__CYGWIN__) || defined(__FreeBSD__)
+ /* fp_->_offset is typed as an integer. */
+ fp_->_offset = pos;
+ # else
+@@ -124,7 +124,7 @@
off_t o;
} u;
u.o = pos;
Home |
Main Index |
Thread Index |
Old Index