diff options
| author | Michael Shalayeff <mickey@cvs.openbsd.org> | 1996-11-27 11:59:44 +0000 |
|---|---|---|
| committer | Michael Shalayeff <mickey@cvs.openbsd.org> | 1996-11-27 11:59:44 +0000 |
| commit | 6c7e53992a9e37a335726966b7d5ff0ca28b0997 (patch) | |
| tree | 3fa7b3d368ee3248895311d5281752e17d5ba6f1 | |
| parent | 8abdb443c6f7d1e8fe6ccbf5cac9b09fc066cde1 (diff) | |
don't define min,max if libkern.h included.
| -rw-r--r-- | sys/lib/libsa/stand.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/sys/lib/libsa/stand.h b/sys/lib/libsa/stand.h index 1d5ba9e70f7..0a26b276266 100644 --- a/sys/lib/libsa/stand.h +++ b/sys/lib/libsa/stand.h @@ -1,4 +1,4 @@ -/* $OpenBSD: stand.h,v 1.13 1996/10/29 07:59:29 mickey Exp $ */ +/* $OpenBSD: stand.h,v 1.14 1996/11/27 11:59:43 mickey Exp $ */ /* $NetBSD: stand.h,v 1.13 1996/01/13 22:25:42 leo Exp $ */ /*- @@ -53,8 +53,11 @@ struct stat; * Useful macros */ #define NENTS(x) sizeof(x)/sizeof(x[0]) +/* don't define if libker included */ +#ifndef LIBKERN_INLINE #define max(a,b) (((a)>(b))? (a) : (b)) #define min(a,b) (((a)>(b))? (b) : (a)) +#endif /* * This structure is used to define file system operations in a file system @@ -186,7 +189,7 @@ int getchar __P((void)); /* Machine dependent functions */ int devopen __P((struct open_file *, const char *, char **)); -void machdep_start __P((char *, int, char *, char *, char *)); +void machdep_exec __P((char *, int, char *, char *, char *)); time_t getsecs __P((void)); void putc __P((int)); int getc __P((void)); |