Deleted Added
full compact
am_defs.h (38578) am_defs.h (41145)
1/*
2 * Copyright (c) 1997-1998 Erez Zadok
3 * Copyright (c) 1990 Jan-Simon Pendry
4 * Copyright (c) 1990 Imperial College of Science, Technology & Medicine
5 * Copyright (c) 1990 The Regents of the University of California.
6 * All rights reserved.
7 *
8 * This code is derived from software contributed to Berkeley by

--- 24 unchanged lines hidden (view full) ---

33 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
34 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
35 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
36 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
37 * SUCH DAMAGE.
38 *
39 * %W% (Berkeley) %G%
40 *
1/*
2 * Copyright (c) 1997-1998 Erez Zadok
3 * Copyright (c) 1990 Jan-Simon Pendry
4 * Copyright (c) 1990 Imperial College of Science, Technology & Medicine
5 * Copyright (c) 1990 The Regents of the University of California.
6 * All rights reserved.
7 *
8 * This code is derived from software contributed to Berkeley by

--- 24 unchanged lines hidden (view full) ---

33 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
34 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
35 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
36 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
37 * SUCH DAMAGE.
38 *
39 * %W% (Berkeley) %G%
40 *
41 * $Id: am_defs.h,v 1.1.1.1 1998/08/23 22:07:20 obrien Exp $
41 * $Id: am_defs.h,v 1.2 1998/08/27 07:33:23 obrien Exp $
42 *
43 */
44
45/*
46 * Definitions that are not specific to the am-utils package, but
47 * are rather generic, and can be used elsewhere.
48 */
49

--- 432 unchanged lines hidden (view full) ---

482# undef MS_MGC_VAL
483# undef MS_RMT_MASK
484/* conflicts with <waitflags.h> */
485# undef WNOHANG
486# undef WUNTRACED
487/* conflicts with <statfsbuf.h> */
488# define _SYS_STATFS_H
489# endif /* HAVE_SOCKETBITS_H */
42 *
43 */
44
45/*
46 * Definitions that are not specific to the am-utils package, but
47 * are rather generic, and can be used elsewhere.
48 */
49

--- 432 unchanged lines hidden (view full) ---

482# undef MS_MGC_VAL
483# undef MS_RMT_MASK
484/* conflicts with <waitflags.h> */
485# undef WNOHANG
486# undef WUNTRACED
487/* conflicts with <statfsbuf.h> */
488# define _SYS_STATFS_H
489# endif /* HAVE_SOCKETBITS_H */
490# ifdef HAVE_LINUX_POSIX_TYPES_H
491# include <linux/posix_types.h>
492# endif /* HAVE_LINUX_POSIX_TYPES_H */
493# ifndef _LINUX_BYTEORDER_GENERIC_H
494# define _LINUX_BYTEORDER_GENERIC_H
495# endif /* _LINUX_BYTEORDER_GENERIC_H */
496/* conflicts with <sys/mount.h> in 2.1 kernels */
497# ifdef _SYS_MOUNT_H
498# ifdef BLOCK_SIZE
499# undef BLOCK_SIZE
500# endif /* BLOCK_SIZE */
501# endif /* _SYS_MOUNT_H */
490# include <linux/fs.h>
491#endif /* HAVE_LINUX_FS_H */
492
493#ifdef HAVE_CDFS_CDFS_MOUNT_H
494# include <cdfs/cdfs_mount.h>
495#endif /* HAVE_CDFS_CDFS_MOUNT_H */
496
497#ifdef HAVE_CDFS_CDFSMOUNT_H

--- 826 unchanged lines hidden ---
502# include <linux/fs.h>
503#endif /* HAVE_LINUX_FS_H */
504
505#ifdef HAVE_CDFS_CDFS_MOUNT_H
506# include <cdfs/cdfs_mount.h>
507#endif /* HAVE_CDFS_CDFS_MOUNT_H */
508
509#ifdef HAVE_CDFS_CDFSMOUNT_H

--- 826 unchanged lines hidden ---