diff options
author | obrien <obrien@FreeBSD.org> | 1999-09-23 05:36:01 +0000 |
---|---|---|
committer | obrien <obrien@FreeBSD.org> | 1999-09-23 05:36:01 +0000 |
commit | fd1d2c9a38b07a9d16225468f89ed9df7518bac5 (patch) | |
tree | 510b4d83c80e50125e76f8c378634083271b8833 /contrib/amd/include/am_defs.h | |
parent | 7955c51a1decf1c8e74dc5dc5f4d7d8f9ea396c0 (diff) | |
download | FreeBSD-src-fd1d2c9a38b07a9d16225468f89ed9df7518bac5.zip FreeBSD-src-fd1d2c9a38b07a9d16225468f89ed9df7518bac5.tar.gz |
Fix conflicts.
Version 6.0.2s2 gives us a better fix a buffer overflow problem in
real_plog(). It also gives us a few code cleanups to quiet `gcc -Wall'.
Diffstat (limited to 'contrib/amd/include/am_defs.h')
-rw-r--r-- | contrib/amd/include/am_defs.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/contrib/amd/include/am_defs.h b/contrib/amd/include/am_defs.h index 9197b71..66f08b9 100644 --- a/contrib/amd/include/am_defs.h +++ b/contrib/amd/include/am_defs.h @@ -38,7 +38,7 @@ * * %W% (Berkeley) %G% * - * $Id: am_defs.h,v 1.10 1999/08/22 05:12:54 ezk Exp $ + * $Id: am_defs.h,v 1.11 1999/09/18 08:38:05 ezk Exp $ * $FreeBSD$ * */ @@ -1345,6 +1345,10 @@ extern caddr_t sbrk(int incr); extern int seteuid(uid_t euid); #endif /* not defined(HAVE_SETEUID) && !defined(HAVE_EXTERN_SETEUID) */ +#if defined(HAVE_SETITIMER) && !defined(HAVE_EXTERN_SETITIMER) +extern int setitimer(int, struct itimerval *, struct itimerval *); +#endif /* defined(HAVE_SETITIMER) && !defined(HAVE_EXTERN_SETITIMER) */ + #ifndef HAVE_EXTERN_STRCASECMP /* * define this extern even if function does not exist, for it will |