summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/Makefile25
-rw-r--r--include/err.h31
-rw-r--r--include/ieeefp.h25
-rw-r--r--include/kvm.h21
-rw-r--r--include/paths.h2
-rw-r--r--include/protocols/dumprestore.h18
-rw-r--r--include/protocols/rwhod.h2
-rw-r--r--include/protocols/talkd.h6
-rw-r--r--include/pthread.h10
-rw-r--r--include/pwd.h4
-rw-r--r--include/rpcsvc/bootparam_prot.x2
-rw-r--r--include/rpcsvc/klm_prot.x2
-rw-r--r--include/rpcsvc/mount.x2
-rw-r--r--include/rpcsvc/nfs_prot.x2
-rw-r--r--include/rpcsvc/rex.x2
-rw-r--r--include/rpcsvc/rnusers.x2
-rw-r--r--include/rpcsvc/rquota.x2
-rw-r--r--include/rpcsvc/rstat.x2
-rw-r--r--include/rpcsvc/spray.x2
-rw-r--r--include/rpcsvc/yppasswd.x2
-rw-r--r--include/stdio.h4
-rw-r--r--include/stdlib.h8
-rw-r--r--include/string.h1
-rw-r--r--include/time.h11
-rw-r--r--include/unistd.h1
25 files changed, 81 insertions, 108 deletions
diff --git a/include/Makefile b/include/Makefile
index 8e7c317d4a2b0..b72614b24397b 100644
--- a/include/Makefile
+++ b/include/Makefile
@@ -1,16 +1,18 @@
-# @(#)Makefile 8.2 (Berkeley) 1/4/94
-# $Id: Makefile,v 1.91 1999/01/14 19:52:38 jdp Exp $
+# From: @(#)Makefile 8.2 (Berkeley) 1/4/94
+# $Id: Makefile,v 1.85 1998/10/02 00:49:43 ache Exp $
#
# Doing a make install builds /usr/include
#
# The ``rm -rf''s used below are safe because rm doesn't follow symbolic
# links.
+#
+depend lint tags:
CLEANFILES= osreldate.h version vers.c
SUBDIR= rpcsvc
FILES= a.out.h ar.h assert.h bitstring.h ctype.h db.h dirent.h disktab.h \
dlfcn.h elf.h err.h fnmatch.h fstab.h \
- fts.h glob.h grp.h strhash.h histedit.h ieeefp.h iso646.h \
+ fts.h glob.h grp.h strhash.h histedit.h iso646.h \
kvm.h limits.h link.h locale.h malloc.h memory.h mpool.h \
ndbm.h netdb.h nl_types.h nlist.h objformat.h \
paths.h pthread.h pthread_np.h pwd.h \
@@ -36,10 +38,11 @@ MFILES= float.h floatingpoint.h stdarg.h varargs.h
PFILES= mqueue.h sched.h semaphore.h \
# aio.h
-LFILES= aio.h errno.h fcntl.h inttypes.h linker_set.h poll.h syslog.h termios.h
+LFILES= errno.h fcntl.h poll.h syslog.h termios.h
-LDIRS= cam msdosfs net netatalk netatm netinet netipx netkey netns nfs \
- pccard posix4 sys vm
+LDIRS= msdosfs net netns netatalk netatm netinet netipx netkey nfs \
+ pccard posix4 sys vm cam \
+ # netccitt netiso
LNOHEADERDIRS= isofs ufs
LSUBDIRS= isofs/cd9660 ufs/ffs ufs/mfs ufs/ufs cam/scsi
@@ -51,6 +54,8 @@ LSUBDIRS= isofs/cd9660 ufs/ffs ufs/mfs ufs/ufs cam/scsi
#SHARED= symlinks
SHARED?= copies
+
+.if exists (${.CURDIR}/../sys/conf/newvers.sh)
all: osreldate.h
osreldate.h: ${.CURDIR}/../sys/conf/newvers.sh \
@@ -61,6 +66,13 @@ osreldate.h: ${.CURDIR}/../sys/conf/newvers.sh \
echo "$$COPYRIGHT" > osreldate.h; \
echo \#'undef __FreeBSD_version' >> osreldate.h; \
echo \#'define __FreeBSD_version' $$RELDATE >> osreldate.h
+.else
+all:
+ @${ECHO} creating osreldate.h from sysctl info
+ echo \#'undef __FreeBSD_version' > osreldate.h
+ echo \#'define __FreeBSD_version '`sysctl -n kern.osreldate` \
+ >> osreldate.h
+.endif
beforeinstall: ${SHARED}
cd ${.CURDIR}; \
@@ -88,6 +100,7 @@ beforeinstall: ${SHARED}
ln -sf posix4/$i ${DESTDIR}/usr/include/$i
.endfor
+
copies:
.for i in ${LDIRS} ${LNOHEADERDIRS} machine
if [ -h ${DESTDIR}/usr/include/$i ]; then \
diff --git a/include/err.h b/include/err.h
index 96cb9de756d24..a3464af86a8d9 100644
--- a/include/err.h
+++ b/include/err.h
@@ -30,8 +30,8 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * @(#)err.h 8.1 (Berkeley) 6/2/93
- * $Id: err.h,v 1.6 1998/10/29 22:18:47 jdp Exp $
+ * From: @(#)err.h 8.1 (Berkeley) 6/2/93
+ * $Id$
*/
#ifndef _ERR_H_
@@ -48,21 +48,18 @@
#include <sys/cdefs.h>
__BEGIN_DECLS
-void err __P((int, const char *, ...)) __dead2 __printf0like(2, 3);
-void verr __P((int, const char *, _BSD_VA_LIST_)) __dead2
- __printf0like(2, 0);
-void errc __P((int, int, const char *, ...)) __dead2 __printf0like(3, 4);
-void verrc __P((int, int, const char *, _BSD_VA_LIST_)) __dead2
- __printf0like(3, 0);
-void errx __P((int, const char *, ...)) __dead2 __printf0like(2, 3);
-void verrx __P((int, const char *, _BSD_VA_LIST_)) __dead2
- __printf0like(2, 0);
-void warn __P((const char *, ...)) __printf0like(1, 2);
-void vwarn __P((const char *, _BSD_VA_LIST_)) __printf0like(1, 0);
-void warnc __P((int, const char *, ...)) __printf0like(2, 3);
-void vwarnc __P((int, const char *, _BSD_VA_LIST_)) __printf0like(2, 0);
-void warnx __P((const char *, ...)) __printflike(1, 2);
-void vwarnx __P((const char *, _BSD_VA_LIST_)) __printflike(1, 0);
+void err __P((int, const char *, ...)) __dead2;
+void verr __P((int, const char *, _BSD_VA_LIST_)) __dead2;
+void errc __P((int, int, const char *, ...)) __dead2;
+void verrc __P((int, int, const char *, _BSD_VA_LIST_)) __dead2;
+void errx __P((int, const char *, ...)) __dead2;
+void verrx __P((int, const char *, _BSD_VA_LIST_)) __dead2;
+void warn __P((const char *, ...));
+void vwarn __P((const char *, _BSD_VA_LIST_));
+void warnc __P((int, const char *, ...));
+void vwarnc __P((int, const char *, _BSD_VA_LIST_));
+void warnx __P((const char *, ...));
+void vwarnx __P((const char *, _BSD_VA_LIST_));
void err_set_file __P((void *));
void err_set_exit __P((void (*)(int)));
__END_DECLS
diff --git a/include/ieeefp.h b/include/ieeefp.h
deleted file mode 100644
index 83db9a5574fe6..0000000000000
--- a/include/ieeefp.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/* $NetBSD: ieeefp.h,v 1.4 1998/01/09 08:03:43 perry Exp $ */
-
-/*
- * Written by J.T. Conklin, Apr 6, 1995
- * Public domain.
- */
-
-#ifndef _IEEEFP_H_
-#define _IEEEFP_H_
-
-#include <sys/cdefs.h>
-#include <machine/ieeefp.h>
-
-#ifdef i386
-#include <machine/floatingpoint.h>
-#else
-extern fp_rnd fpgetround __P((void));
-extern fp_rnd fpsetround __P((fp_rnd));
-extern fp_except fpgetmask __P((void));
-extern fp_except fpsetmask __P((fp_except));
-extern fp_except fpgetsticky __P((void));
-extern fp_except fpsetsticky __P((fp_except));
-#endif /* i386 */
-
-#endif /* _IEEEFP_H_ */
diff --git a/include/kvm.h b/include/kvm.h
index 9e0d9212a444b..fb2d22435feea 100644
--- a/include/kvm.h
+++ b/include/kvm.h
@@ -31,7 +31,6 @@
* SUCH DAMAGE.
*
* @(#)kvm.h 8.1 (Berkeley) 6/2/93
- * $Id$
*/
#ifndef _KVM_H_
@@ -44,22 +43,11 @@
#include <nlist.h>
#include <sys/cdefs.h>
-#ifdef _BSD_SIZE_T_
-typedef _BSD_SIZE_T_ size_t;
-#undef _BSD_SIZE_T_
-#endif
-
-#ifdef _BSD_SSIZE_T_
-typedef _BSD_SSIZE_T_ ssize_t;
-#undef _BSD_SSIZE_T_
-#endif
+__BEGIN_DECLS
typedef struct __kvm kvm_t;
struct kinfo_proc;
-struct proc;
-
-__BEGIN_DECLS
int kvm_close __P((kvm_t *));
char **kvm_getargv __P((kvm_t *, const struct kinfo_proc *, int));
char **kvm_getenvv __P((kvm_t *, const struct kinfo_proc *, int));
@@ -74,9 +62,12 @@ kvm_t *kvm_open
kvm_t *kvm_openfiles
__P((const char *, const char *, const char *, int, char *));
ssize_t kvm_read __P((kvm_t *, unsigned long, void *, size_t));
-ssize_t kvm_uread
- __P((kvm_t *, const struct proc *, unsigned long, char *, size_t));
ssize_t kvm_write __P((kvm_t *, unsigned long, const void *, size_t));
+/* Comment this out until it can be fixed correctly.
+ssize_t kvm_uread
+ __P((kvm_t *, struct proc *, unsigned long, char *, size_t));
+*/
+
__END_DECLS
#endif /* !_KVM_H_ */
diff --git a/include/paths.h b/include/paths.h
index ea721201da442..06110d90584a6 100644
--- a/include/paths.h
+++ b/include/paths.h
@@ -56,7 +56,7 @@
#define _PATH_MAILDIR "/var/mail"
#define _PATH_MAN "/usr/share/man"
#define _PATH_MEM "/dev/mem"
-#define _PATH_NOLOGIN "/var/run/nologin"
+#define _PATH_NOLOGIN "/etc/nologin"
#define _PATH_SENDMAIL "/usr/sbin/sendmail"
#define _PATH_SHELLS "/etc/shells"
#define _PATH_TTY "/dev/tty"
diff --git a/include/protocols/dumprestore.h b/include/protocols/dumprestore.h
index 9721082a900f6..72eddcd0f2da8 100644
--- a/include/protocols/dumprestore.h
+++ b/include/protocols/dumprestore.h
@@ -67,25 +67,25 @@
union u_spcl {
char dummy[TP_BSIZE];
struct s_spcl {
- int32_t c_type; /* record type (see below) */
+ long c_type; /* record type (see below) */
time_t c_date; /* date of this dump */
time_t c_ddate; /* date of previous dump */
- int32_t c_volume; /* dump volume number */
+ long c_volume; /* dump volume number */
daddr_t c_tapea; /* logical block of this record */
ino_t c_inumber; /* number of inode */
- int32_t c_magic; /* magic number (see above) */
- int32_t c_checksum; /* record checksum */
+ long c_magic; /* magic number (see above) */
+ long c_checksum; /* record checksum */
struct dinode c_dinode; /* ownership and mode of inode */
- int32_t c_count; /* number of valid c_addr entries */
+ long c_count; /* number of valid c_addr entries */
char c_addr[TP_NINDIR]; /* 1 => data; 0 => hole in inode */
char c_label[LBLSIZE]; /* dump label */
- int32_t c_level; /* level of this dump */
+ long c_level; /* level of this dump */
char c_filesys[NAMELEN]; /* name of dumpped file system */
char c_dev[NAMELEN]; /* name of dumpped device */
char c_host[NAMELEN]; /* name of dumpped host */
- int32_t c_flags; /* additional information */
- int32_t c_firstrec; /* first record on volume */
- int32_t c_spare[32]; /* reserved for future uses */
+ long c_flags; /* additional information */
+ long c_firstrec; /* first record on volume */
+ long c_spare[32]; /* reserved for future uses */
} s_spcl;
} u_spcl;
#define spcl u_spcl.s_spcl
diff --git a/include/protocols/rwhod.h b/include/protocols/rwhod.h
index fbfe2ed7cb04d..df61d3ca2d27f 100644
--- a/include/protocols/rwhod.h
+++ b/include/protocols/rwhod.h
@@ -42,7 +42,7 @@
struct outmp {
char out_line[8]; /* tty name */
char out_name[8]; /* user id */
- int32_t out_time; /* time on */
+ long out_time; /* time on */
};
struct whod {
diff --git a/include/protocols/talkd.h b/include/protocols/talkd.h
index 962e47be7e0dc..34b5da2e567e1 100644
--- a/include/protocols/talkd.h
+++ b/include/protocols/talkd.h
@@ -62,10 +62,10 @@ typedef struct {
u_char type; /* request type, see below */
u_char answer; /* not used */
u_char pad;
- u_int32_t id_num; /* message id */
+ u_long id_num; /* message id */
struct osockaddr addr; /* old (4.3) style */
struct osockaddr ctl_addr; /* old (4.3) style */
- int32_t pid; /* caller's process id */
+ long pid; /* caller's process id */
#define NAME_SIZE 12
char l_name[NAME_SIZE];/* caller's name */
char r_name[NAME_SIZE];/* callee's name */
@@ -81,7 +81,7 @@ typedef struct {
u_char type; /* type of request message, see below */
u_char answer; /* respose to request message, see below */
u_char pad;
- u_int32_t id_num; /* message id */
+ u_long id_num; /* message id */
struct osockaddr addr; /* address for establishing conversation */
} CTL_RESPONSE;
diff --git a/include/pthread.h b/include/pthread.h
index dc8ebf08b1720..0c382710cf133 100644
--- a/include/pthread.h
+++ b/include/pthread.h
@@ -164,16 +164,11 @@ struct pthread_once {
#endif
enum pthread_mutextype {
- PTHREAD_MUTEX_DEFAULT = 1,
- PTHREAD_MUTEX_RECURSIVE = 2,
- PTHREAD_MUTEX_NORMAL = 3,
- PTHREAD_MUTEX_ERRORCHECK = 4,
+ MUTEX_TYPE_FAST = 1,
+ MUTEX_TYPE_COUNTING_FAST = 2, /* Recursive */
MUTEX_TYPE_MAX
};
-#define MUTEX_TYPE_FAST PTHREAD_MUTEX_DEFAULT
-#define MUTEX_TYPE_COUNTING_FAST PTHREAD_MUTEX_RECURSIVE
-
/*
* Thread function prototype definitions:
*/
@@ -238,7 +233,6 @@ int pthread_mutexattr_setprotocol __P((pthread_mutexattr_t *,
int protocol));
int pthread_mutexattr_setpshared __P((pthread_mutexattr_t *,
int pshared));
-int pthread_mutexattr_settype __P((pthread_mutexattr_t *, int));
int pthread_mutex_destroy __P((pthread_mutex_t *));
int pthread_mutex_getprioceiling __P((pthread_mutex_t *));
int pthread_mutex_init __P((pthread_mutex_t *,
diff --git a/include/pwd.h b/include/pwd.h
index 88d705d896212..895ced304efba 100644
--- a/include/pwd.h
+++ b/include/pwd.h
@@ -71,8 +71,8 @@
struct passwd {
char *pw_name; /* user name */
char *pw_passwd; /* encrypted password */
- uid_t pw_uid; /* user uid */
- gid_t pw_gid; /* user gid */
+ int pw_uid; /* user uid */
+ int pw_gid; /* user gid */
time_t pw_change; /* password change time */
char *pw_class; /* user access class */
char *pw_gecos; /* Honeywell login info */
diff --git a/include/rpcsvc/bootparam_prot.x b/include/rpcsvc/bootparam_prot.x
index 5b0b27b2fa1ee..249ed8ab90af4 100644
--- a/include/rpcsvc/bootparam_prot.x
+++ b/include/rpcsvc/bootparam_prot.x
@@ -48,7 +48,7 @@
%#ifndef lint
%/*static char sccsid[] = "from: @(#)bootparam_prot.x 1.2 87/06/24 Copyr 1987 Sun Micro";*/
%/*static char sccsid[] = "from: @(#)bootparam_prot.x 2.1 88/08/01 4.0 RPCSRC";*/
-%static const char rcsid[] = "bootparam_prot.x,v 1.1 1994/08/04 19:01:44 wollman Exp";
+%static char rcsid[] = "bootparam_prot.x,v 1.1 1994/08/04 19:01:44 wollman Exp";
%#endif /* not lint */
#endif
diff --git a/include/rpcsvc/klm_prot.x b/include/rpcsvc/klm_prot.x
index c514a90861816..c84b9b2d98d94 100644
--- a/include/rpcsvc/klm_prot.x
+++ b/include/rpcsvc/klm_prot.x
@@ -40,7 +40,7 @@
%#ifndef lint
%/*static char sccsid[] = "from: @(#)klm_prot.x 1.7 87/07/08 Copyr 1987 Sun Micro";*/
%/*static char sccsid[] = "from: @(#)klm_prot.x 2.1 88/08/01 4.0 RPCSRC";*/
-%static const char rcsid[] = "$Id: klm_prot.x,v 1.4 1997/05/28 04:38:14 wpaul Exp $";
+%static char rcsid[] = "$Id: klm_prot.x,v 1.1 1994/08/04 19:01:45 wollman Exp $";
%#endif /* not lint */
#endif
diff --git a/include/rpcsvc/mount.x b/include/rpcsvc/mount.x
index c15164782ea35..d7ee70cf13808 100644
--- a/include/rpcsvc/mount.x
+++ b/include/rpcsvc/mount.x
@@ -35,7 +35,7 @@
%#ifndef lint
%/*static char sccsid[] = "from: @(#)mount.x 1.2 87/09/18 Copyr 1987 Sun Micro";*/
%/*static char sccsid[] = "from: @(#)mount.x 2.1 88/08/01 4.0 RPCSRC";*/
-%static const char rcsid[] = "$Id: mount.x,v 1.4 1997/04/18 12:31:26 dfr Exp $";
+%static char rcsid[] = "$Id: mount.x,v 1.3 1997/02/23 09:17:29 peter Exp $";
%#endif /* not lint */
#endif
diff --git a/include/rpcsvc/nfs_prot.x b/include/rpcsvc/nfs_prot.x
index c255a104646be..863efe1b9e773 100644
--- a/include/rpcsvc/nfs_prot.x
+++ b/include/rpcsvc/nfs_prot.x
@@ -31,7 +31,7 @@
%#ifndef lint
%/*static char sccsid[] = "from: @(#)nfs_prot.x 1.2 87/10/12 Copyr 1987 Sun Micro";*/
%/*static char sccsid[] = "from: @(#)nfs_prot.x 2.1 88/08/01 4.0 RPCSRC";*/
-%static const char rcsid[] = "$Id: nfs_prot.x,v 1.5 1998/09/06 09:21:35 obrien Exp $";
+%static char rcsid[] = "$Id: nfs_prot.x,v 1.4 1997/04/18 12:31:27 dfr Exp $";
%#endif /* not lint */
#endif
diff --git a/include/rpcsvc/rex.x b/include/rpcsvc/rex.x
index 1be8b48ab94f1..f027d28eef909 100644
--- a/include/rpcsvc/rex.x
+++ b/include/rpcsvc/rex.x
@@ -35,7 +35,7 @@
%#ifndef lint
%/*static char sccsid[] = "from: @(#)rex.x 1.3 87/09/18 Copyr 1987 Sun Micro";*/
%/*static char sccsid[] = "from: @(#)rex.x 2.1 88/08/01 4.0 RPCSRC";*/
-%static const char rcsid[] = "$Id: rex.x,v 1.4 1997/05/28 04:38:19 wpaul Exp $";
+%static char rcsid[] = "$Id: rex.x,v 1.1 1994/08/04 19:01:49 wollman Exp $";
%#endif /* not lint */
#endif
diff --git a/include/rpcsvc/rnusers.x b/include/rpcsvc/rnusers.x
index 22986d8cc3758..0ba524872bcc0 100644
--- a/include/rpcsvc/rnusers.x
+++ b/include/rpcsvc/rnusers.x
@@ -35,7 +35,7 @@
%#ifndef lint
%/*static char sccsid[] = "from: @(#)rnusers.x 1.2 87/09/20 Copyr 1987 Sun Micro";*/
%/*static char sccsid[] = "from: @(#)rnusers.x 2.1 88/08/01 4.0 RPCSRC";*/
-%static const char rcsid[] = "$Id: rnusers.x,v 1.4 1997/05/28 04:38:19 wpaul Exp $";
+%static char rcsid[] = "$Id: rnusers.x,v 1.1 1994/08/04 19:01:50 wollman Exp $";
%#endif /* not lint */
#endif
diff --git a/include/rpcsvc/rquota.x b/include/rpcsvc/rquota.x
index 2209339bb795d..476d76bd2be19 100644
--- a/include/rpcsvc/rquota.x
+++ b/include/rpcsvc/rquota.x
@@ -7,7 +7,7 @@
%#ifndef lint
%/*static char sccsid[] = "from: @(#)rquota.x 1.2 87/09/20 Copyr 1987 Sun Micro";*/
%/*static char sccsid[] = "from: @(#)rquota.x 2.1 88/08/01 4.0 RPCSRC";*/
-%static const char rcsid[] = "$Id: rquota.x,v 1.4 1997/05/28 04:38:20 wpaul Exp $";
+%static char rcsid[] = "$Id: rquota.x,v 1.1 1994/08/04 19:01:50 wollman Exp $";
%#endif /* not lint */
#endif
diff --git a/include/rpcsvc/rstat.x b/include/rpcsvc/rstat.x
index a46388afda185..0c55005cca17a 100644
--- a/include/rpcsvc/rstat.x
+++ b/include/rpcsvc/rstat.x
@@ -47,7 +47,7 @@
%#ifndef lint
%/*static char sccsid[] = "from: @(#)rstat.x 1.2 87/09/18 Copyr 1987 Sun Micro";*/
%/*static char sccsid[] = "from: @(#)rstat.x 2.2 88/08/01 4.0 RPCSRC";*/
-%static const char rcsid[] = "$Id: rstat.x,v 1.4 1997/05/28 04:38:20 wpaul Exp $";
+%static char rcsid[] = "$Id: rstat.x,v 1.1 1994/08/04 19:01:51 wollman Exp $";
%#endif /* not lint */
#endif /* def RPC_HDR */
diff --git a/include/rpcsvc/spray.x b/include/rpcsvc/spray.x
index a2227fd6dd088..5ae7a4d1780d0 100644
--- a/include/rpcsvc/spray.x
+++ b/include/rpcsvc/spray.x
@@ -36,7 +36,7 @@
%#ifndef lint
%/*static char sccsid[] = "from: @(#)spray.x 1.2 87/09/18 Copyr 1987 Sun Micro";*/
%/*static char sccsid[] = "from: @(#)spray.x 2.1 88/08/01 4.0 RPCSRC";*/
-%static const char rcsid[] = "$Id: spray.x,v 1.4 1997/05/28 04:38:22 wpaul Exp $";
+%static char rcsid[] = "$Id: spray.x,v 1.1 1994/08/04 19:01:54 wollman Exp $";
%#endif /* not lint */
#endif
diff --git a/include/rpcsvc/yppasswd.x b/include/rpcsvc/yppasswd.x
index 26a9e4a25477a..c1505b31a19fa 100644
--- a/include/rpcsvc/yppasswd.x
+++ b/include/rpcsvc/yppasswd.x
@@ -36,7 +36,7 @@
%#ifndef lint
%/*static char sccsid[] = "from: @(#)yppasswd.x 1.1 87/04/13 Copyr 1987 Sun Micro";*/
%/*static char sccsid[] = "from: @(#)yppasswd.x 2.1 88/08/01 4.0 RPCSRC";*/
-%static const char rcsid[] = "$Id: yppasswd.x,v 1.4 1997/05/28 04:38:27 wpaul Exp $";
+%static char rcsid[] = "$Id: yppasswd.x,v 1.1 1994/08/04 19:01:57 wollman Exp $";
%#endif /* not lint */
#endif
diff --git a/include/stdio.h b/include/stdio.h
index b2f6957c7a165..c7db2dd91d97d 100644
--- a/include/stdio.h
+++ b/include/stdio.h
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* @(#)stdio.h 8.5 (Berkeley) 4/29/95
- * $Id: stdio.h,v 1.20 1998/07/13 06:45:20 bde Exp $
+ * $Id: stdio.h,v 1.19 1998/07/08 00:52:40 peter Exp $
*/
#ifndef _STDIO_H_
@@ -279,7 +279,7 @@ _BSD_OFF_T_ lseek __P((int, _BSD_OFF_T_, int));
#endif
#ifndef _MMAP_DECLARED
#define _MMAP_DECLARED
-void *mmap __P((void *, size_t, int, int, int, _BSD_OFF_T_));
+char *mmap __P((void *, size_t, int, int, int, _BSD_OFF_T_));
#endif
#ifndef _TRUNCATE_DECLARED
#define _TRUNCATE_DECLARED
diff --git a/include/stdlib.h b/include/stdlib.h
index db30a5abc900b..a78dafa5dbf34 100644
--- a/include/stdlib.h
+++ b/include/stdlib.h
@@ -41,6 +41,8 @@
#include <machine/ansi.h>
#if !defined(_ANSI_SOURCE) && !defined(_POSIX_SOURCE)
+#include <machine/types.h>
+
#ifdef _BSD_RUNE_T_
typedef _BSD_RUNE_T_ rune_t;
#undef _BSD_RUNE_T_
@@ -130,7 +132,7 @@ void srand48 __P((long));
void *alloca __P((size_t)); /* built-in for gcc */
/* getcap(3) functions */
-__uint32_t
+u_int32_t
arc4random __P((void));
void arc4random_addrandom __P((unsigned char *dat, int datlen));
void arc4random_stir __P((void));
@@ -168,8 +170,8 @@ void srandom __P((unsigned long));
void srandomdev __P((void));
char *user_from_uid __P((unsigned long, int));
#ifndef __STRICT_ANSI__
-__int64_t strtoq __P((const char *, char **, int));
-__uint64_t
+int64_t strtoq __P((const char *, char **, int));
+u_int64_t
strtouq __P((const char *, char **, int));
#endif
void unsetenv __P((const char *));
diff --git a/include/string.h b/include/string.h
index acfebfc7141ae..81c868ab98f5b 100644
--- a/include/string.h
+++ b/include/string.h
@@ -86,7 +86,6 @@ char *strdup __P((const char *));
void strmode __P((int, char *));
int strncasecmp __P((const char *, const char *, size_t));
char *strsep __P((char **, const char *));
-char *strtok_r __P((char *, const char *, char **));
void swab __P((const void *, void *, size_t));
#endif
__END_DECLS
diff --git a/include/time.h b/include/time.h
index a9baa50ff1fd8..58409776ff18f 100644
--- a/include/time.h
+++ b/include/time.h
@@ -131,15 +131,18 @@ time_t mktime __P((struct tm *));
size_t strftime __P((char *, size_t, const char *, const struct tm *));
time_t time __P((time_t *));
+#ifdef _THREAD_SAFE
+char *asctime_r __P((const struct tm *, char *));
+char *ctime_r __P((const time_t *, char *));
+struct tm *gmtime_r __P((const time_t *, struct tm *));
+struct tm *localtime_r __P((const time_t *, struct tm *));
+#endif
+
#ifndef _ANSI_SOURCE
void tzset __P((void));
#endif /* not ANSI */
#if !defined(_ANSI_SOURCE) && !defined(_POSIX_SOURCE)
-char *asctime_r __P((const struct tm *, char *));
-char *ctime_r __P((const time_t *, char *));
-struct tm *gmtime_r __P((const time_t *, struct tm *));
-struct tm *localtime_r __P((const time_t *, struct tm *));
char *strptime __P((const char *, const char *, struct tm *));
char *timezone __P((int, int));
void tzsetwall __P((void));
diff --git a/include/unistd.h b/include/unistd.h
index 13afc190e8b5d..e88da17138142 100644
--- a/include/unistd.h
+++ b/include/unistd.h
@@ -202,7 +202,6 @@ pid_t vfork __P((void));
extern char *suboptarg; /* getsubopt(3) external variable */
int getsubopt __P((char **, char * const *, char **));
#endif /* !_POSIX_SOURCE */
-extern int optreset; /* getopt(3) external variable */
__END_DECLS
#endif /* !_UNISTD_H_ */
generated by cgit v1.2.3 (git 2.25.1) at 2025-10-24 23:16:31 +0000