[src/nathanw_sa]: src/include Sync with HEAD.

[thorpej <thorpej%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/5d63009720ea
branches:  nathanw_sa
changeset: 506241:5d63009720ea
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Fri Sep 20 22:01:49 2002 +0000

description:
Sync with HEAD.

diffstat:

 include/Makefile         |  6 +++---
 include/heimdal/config.h |  6 ++++++
 include/heimdal/roken.h  |  5 ++++-
 include/util.h           |  3 ++-
 4 files changed, 15 insertions(+), 5 deletions(-)

diffs (86 lines):

diff -r 24124cd914b9 -r 5d63009720ea include/Makefile
--- a/include/Makefile  Fri Sep 20 21:04:59 2002 +0000
+++ b/include/Makefile  Fri Sep 20 22:01:49 2002 +0000
@@ -1,8 +1,10 @@
-#      $NetBSD: Makefile,v 1.95.2.11 2002/04/25 04:07:10 nathanw Exp $
+#      $NetBSD: Makefile,v 1.95.2.12 2002/09/20 22:01:49 thorpej Exp $
 #      @(#)Makefile    8.2 (Berkeley) 1/4/94
 
 # Doing a make includes builds /usr/include
 
+NOOBJ=         # defined
+
 # Missing: mp.h
 
 INCS=  a.out.h ar.h assert.h bitstring.h bm.h cpio.h ctype.h db.h dirent.h \
@@ -32,8 +34,6 @@
 
 INCSDIR=       /usr/include
 
-NOOBJ=         # defined
-
 SUBDIR=                rpc
 
 .include <bsd.prog.mk>
diff -r 24124cd914b9 -r 5d63009720ea include/heimdal/config.h
--- a/include/heimdal/config.h  Fri Sep 20 21:04:59 2002 +0000
+++ b/include/heimdal/config.h  Fri Sep 20 22:01:49 2002 +0000
@@ -538,6 +538,9 @@
 /* Define to 1 if you have the `pidfile' function. */
 #define HAVE_PIDFILE 1
 
+/* Define to 1 if you have the `poll' function. */
+#define HAVE_POLL 1
+
 /* Define to 1 if you have the <pthread.h> header file. */
 /* #undef HAVE_PTHREAD_H */
 
@@ -868,6 +871,9 @@
 /* Define to 1 if you have the <sys/param.h> header file. */
 #define HAVE_SYS_PARAM_H 1
 
+/* Define to 1 if you have the <sys/poll.h> header file. */
+#define HAVE_SYS_POLL_H 1
+
 /* Define to 1 if you have the <sys/proc.h> header file. */
 #define HAVE_SYS_PROC_H 1
 
diff -r 24124cd914b9 -r 5d63009720ea include/heimdal/roken.h
--- a/include/heimdal/roken.h   Fri Sep 20 21:04:59 2002 +0000
+++ b/include/heimdal/roken.h   Fri Sep 20 22:01:49 2002 +0000
@@ -39,7 +39,7 @@
  */
 
 /* $Heimdal: roken.h.in,v 1.169 2002/08/26 21:43:38 assar Exp $ 
-   $NetBSD: roken.h,v 1.4.2.2 2002/09/17 21:33:52 nathanw Exp $ */
+   $NetBSD: roken.h,v 1.4.2.3 2002/09/20 22:01:51 thorpej Exp $ */
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -68,6 +68,9 @@
 #include <sys/ioctl.h>
 #include <sys/time.h>
 #include <time.h>
+#ifdef HAVE_SYS_POLL_H
+#include <sys/poll.h>
+#endif
 
 #include <paths.h>
 
diff -r 24124cd914b9 -r 5d63009720ea include/util.h
--- a/include/util.h    Fri Sep 20 21:04:59 2002 +0000
+++ b/include/util.h    Fri Sep 20 22:01:49 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: util.h,v 1.19.2.6 2002/08/27 23:52:36 nathanw Exp $    */
+/*     $NetBSD: util.h,v 1.19.2.7 2002/09/20 22:01:49 thorpej Exp $    */
 
 /*-
  * Copyright (c) 1995
@@ -100,6 +100,7 @@
 void           pw_prompt(void);
 int            pw_setprefix(const char *);
 int            secure_path(const char *);
+int            snprintb(char *, size_t, const char *, uint64_t);
 int            ttyaction(const char *, const char *, const char *);
 int            ttylock(const char *, int, pid_t *);
 char          *ttymsg(struct iovec *, int, const char *, int);