summaryrefslogtreecommitdiff
path: root/misc
diff options
context:
space:
mode:
Diffstat (limited to 'misc')
-rw-r--r--misc/err.h46
-rw-r--r--misc/mntent.h1
2 files changed, 24 insertions, 23 deletions
diff --git a/misc/err.h b/misc/err.h
index c81de1b396..403ef7f701 100644
--- a/misc/err.h
+++ b/misc/err.h
@@ -1,21 +1,21 @@
-/* err.h --- 4.4BSD utility functions for error messages.
-Copyright (C) 1995 Free Software Foundation, Inc.
-This file is part of the GNU C Library.
+/* err.h -- 4.4BSD utility functions for error messages.
+ Copyright (C) 1995, 1996 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
-The GNU C Library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Library General Public License as
-published by the Free Software Foundation; either version 2 of the
-License, or (at your option) any later version.
+ The GNU C Library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Library General Public License as
+ published by the Free Software Foundation; either version 2 of the
+ License, or (at your option) any later version.
-The GNU C Library 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
-Library General Public License for more details.
+ The GNU C Library 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
+ Library General Public License for more details.
-You should have received a copy of the GNU Library General Public
-License along with the GNU C Library; see the file COPYING.LIB. If
-not, write to the Free Software Foundation, Inc., 675 Mass Ave,
-Cambridge, MA 02139, USA. */
+ You should have received a copy of the GNU Library General Public
+ License along with the GNU C Library; see the file COPYING.LIB. If not,
+ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA. */
#ifndef _ERR_H_
#define _ERR_H_ 1
@@ -30,25 +30,25 @@ Cambridge, MA 02139, USA. */
__BEGIN_DECLS
/* Print FORMAT on stderr. */
-extern void warn __P ((const char *__format, ...))
+extern void warn __P ((__const char *__format, ...))
__attribute__ ((format (printf, 1, 2)));
-extern void vwarn __P ((const char *__format, __gnuc_va_list))
+extern void vwarn __P ((__const char *__format, __gnuc_va_list))
__attribute__ ((format (printf, 1, 0)));
/* Print "program: ", and FORMAT, and a newline, on stderr. */
-extern void warnx __P ((const char *__format, ...))
+extern void warnx __P ((__const char *__format, ...))
__attribute__ ((format (printf, 1, 2)));
-extern void vwarnx __P ((const char *__format, __gnuc_va_list))
+extern void vwarnx __P ((__const char *__format, __gnuc_va_list))
__attribute__ ((format (printf, 1, 0)));
/* Likewise, and then exit with STATUS. */
-extern void err __P ((int __status, const char *__format, ...))
+extern void err __P ((int __status, __const char *__format, ...))
__attribute__ ((noreturn, format (printf, 2, 3)));
-extern void verr __P ((int __status, const char *__format, __gnuc_va_list))
+extern void verr __P ((int __status, __const char *__format, __gnuc_va_list))
__attribute__ ((noreturn, format (printf, 2, 0)));
-extern void errx __P ((int __status, const char *__format, ...))
+extern void errx __P ((int __status, __const char *__format, ...))
__attribute__ ((noreturn, format (printf, 2, 3)));
-extern void verrx __P ((int __status, const char *, __gnuc_va_list))
+extern void verrx __P ((int __status, __const char *, __gnuc_va_list))
__attribute__ ((noreturn, format (printf, 2, 0)));
__END_DECLS
diff --git a/misc/mntent.h b/misc/mntent.h
index fc9c824135..bfa1dee797 100644
--- a/misc/mntent.h
+++ b/misc/mntent.h
@@ -23,6 +23,7 @@ Cambridge, MA 02139, USA. */
#include <features.h>
#define __need_FILE
#include <stdio.h>
+#include <paths.h>
/* File listing canonical interesting mount points. */