diff options
| author | obrien <obrien@FreeBSD.org> | 1998-11-14 03:13:33 +0000 |
|---|---|---|
| committer | obrien <obrien@FreeBSD.org> | 1998-11-14 03:13:33 +0000 |
| commit | f3f64ef024d63360298245ec26ebf66eb395bd71 (patch) | |
| tree | d7c98193482b80a21d31de21be70e8f70eb820f1 /contrib/amd/include | |
| parent | d9a3e6b7f346909cb3bf355119d588c1c35beb53 (diff) | |
| download | FreeBSD-src-f3f64ef024d63360298245ec26ebf66eb395bd71.zip FreeBSD-src-f3f64ef024d63360298245ec26ebf66eb395bd71.tar.gz | |
Clean up conflicts.
Diffstat (limited to 'contrib/amd/include')
| -rw-r--r-- | contrib/amd/include/am_defs.h | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/contrib/amd/include/am_defs.h b/contrib/amd/include/am_defs.h index b7d36c2..b4bf384 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.1.1.1 1998/08/23 22:07:20 obrien Exp $ + * $Id: am_defs.h,v 1.2 1998/08/27 07:33:23 obrien Exp $ * */ @@ -487,6 +487,18 @@ extern int errno; /* conflicts with <statfsbuf.h> */ # define _SYS_STATFS_H # endif /* HAVE_SOCKETBITS_H */ +# ifdef HAVE_LINUX_POSIX_TYPES_H +# include <linux/posix_types.h> +# endif /* HAVE_LINUX_POSIX_TYPES_H */ +# ifndef _LINUX_BYTEORDER_GENERIC_H +# define _LINUX_BYTEORDER_GENERIC_H +# endif /* _LINUX_BYTEORDER_GENERIC_H */ +/* conflicts with <sys/mount.h> in 2.1 kernels */ +# ifdef _SYS_MOUNT_H +# ifdef BLOCK_SIZE +# undef BLOCK_SIZE +# endif /* BLOCK_SIZE */ +# endif /* _SYS_MOUNT_H */ # include <linux/fs.h> #endif /* HAVE_LINUX_FS_H */ |
