Module Name: src
Committed By: christos
Date: Mon Oct 2 22:19:45 UTC 2017
Modified Files:
src/tools/compat: compat_defs.h configure.ac fpurge.c
Log Message:
handle __fpurge being declared in <stdio_ext.h>
To generate a diff of this commit:
cvs rdiff -u -r1.107 -r1.108 src/tools/compat/compat_defs.h
cvs rdiff -u -r1.87 -r1.88 src/tools/compat/configure.ac
cvs rdiff -u -r1.1 -r1.2 src/tools/compat/fpurge.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tools/compat/compat_defs.h
diff -u src/tools/compat/compat_defs.h:1.107 src/tools/compat/compat_defs.h:1.108
--- src/tools/compat/compat_defs.h:1.107 Sat Jan 7 16:29:30 2017
+++ src/tools/compat/compat_defs.h Mon Oct 2 18:19:45 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: compat_defs.h,v 1.107 2017/01/07 21:29:30 christos Exp $ */
+/* $NetBSD: compat_defs.h,v 1.108 2017/10/02 22:19:45 christos Exp $ */
#ifndef __NETBSD_COMPAT_DEFS_H__
#define __NETBSD_COMPAT_DEFS_H__
@@ -252,6 +252,10 @@ extern int optind, opterr, optopt;
char *dirname(char *);
#endif
+#if !HAVE_DECL_FPURGE
+void fpurge(FILE *);
+#endif
+
#if !HAVE_DIRFD
#if HAVE_DIR_DD_FD
#define dirfd(dirp) ((dirp)->dd_fd)
Index: src/tools/compat/configure.ac
diff -u src/tools/compat/configure.ac:1.87 src/tools/compat/configure.ac:1.88
--- src/tools/compat/configure.ac:1.87 Sat Jan 7 16:30:42 2017
+++ src/tools/compat/configure.ac Mon Oct 2 18:19:45 2017
@@ -1,4 +1,4 @@
-# $NetBSD: configure.ac,v 1.87 2017/01/07 21:30:42 christos Exp $
+# $NetBSD: configure.ac,v 1.88 2017/10/02 22:19:45 christos Exp $
#
# Autoconf definition file for libnbcompat.
#
@@ -78,7 +78,7 @@ AC_CHECK_HEADERS(sys/ioctl.h sys/mman.h
# Find headers that may not be available.
AC_HEADER_DIRENT
-AC_CHECK_HEADERS(sys/mtio.h sys/sysmacros.h sys/syslimits.h \
+AC_CHECK_HEADERS(sys/mtio.h sys/sysmacros.h sys/syslimits.h stdio_ext.h \
getopt.h features.h malloc.h sys/poll.h pthread.h stddef.h rpc/types.h)
AC_CHECK_HEADERS(sys/bswap.h machine/bswap.h sys/cdefs.h machine/endian.h \
sys/endian.h sys/featuretest.h err.h inttypes.h libgen.h paths.h \
@@ -140,8 +140,8 @@ AC_CHECK_MEMBERS(struct statvfs.f_iosize
AC_CHECK_MEMBERS(struct tm.tm_gmtoff,,, [#include <time.h>])
# Global variable decls.
-AC_CHECK_DECLS([asprintf, vasprintf, vasnprintf, vsnprintf, fgetln, fparseln
- getdelim, getline, snprintf],,, [
+AC_CHECK_DECLS([asprintf, vasprintf, vasnprintf, vsnprintf, fgetln, fparseln,
+ fpurge, getdelim, getline, snprintf],,, [
#include <stdio.h>
])
Index: src/tools/compat/fpurge.c
diff -u src/tools/compat/fpurge.c:1.1 src/tools/compat/fpurge.c:1.2
--- src/tools/compat/fpurge.c:1.1 Tue Jun 16 18:35:34 2009
+++ src/tools/compat/fpurge.c Mon Oct 2 18:19:45 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: fpurge.c,v 1.1 2009/06/16 22:35:34 christos Exp $ */
+/* $NetBSD: fpurge.c,v 1.2 2017/10/02 22:19:45 christos Exp $ */
/*-
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -36,6 +36,9 @@
#include "nbtool_config.h"
#if !HAVE_FPURGE
+#if HAVE_STDIO_EXT_H
+#include <stdio_ext.h>
+#endif
#include <stdio.h>
#include <fcntl.h>
