two new hacks:

- include <stdbool.h> so bool is available _KERNEL for sys/condvar.h
- include <sys/mutex.h> before defining _KERNEL so it won't try to
  include <machine/intr.h> which isn't available to userland.

fixes builds on sparc64.
This commit is contained in:
mrg 2007-10-09 01:23:20 +00:00
parent 3465d8db6f
commit 862626dd09
2 changed files with 6 additions and 2 deletions

View File

@ -1,4 +1,4 @@
/* $NetBSD: iptests.c,v 1.12 2007/04/14 20:34:22 martin Exp $ */
/* $NetBSD: iptests.c,v 1.13 2007/10/09 01:23:20 mrg Exp $ */
/*
* Copyright (C) 1993-1998 by Darren Reed.
@ -12,6 +12,7 @@ static const char rcsid[] = "@(#)Id: iptests.c,v 2.8.2.8 2007/02/17 12:41:51 dar
#endif
#include <sys/param.h>
#include <sys/types.h>
#include <stdbool.h>
#if defined(__NetBSD__) && defined(__vax__)
/*
* XXX need to declare boolean_t for _KERNEL <sys/files.h>
@ -24,6 +25,7 @@ typedef int boolean_t;
#if !defined(__osf__)
# ifdef __NetBSD__
# include <machine/lock.h>
# include <sys/mutex.h>
# endif
# define _KERNEL
# define KERNEL

View File

@ -1,4 +1,4 @@
/* $NetBSD: sock.c,v 1.12 2007/04/14 20:34:22 martin Exp $ */
/* $NetBSD: sock.c,v 1.13 2007/10/09 01:23:21 mrg Exp $ */
/*
* sock.c (C) 1995-1998 Darren Reed
@ -14,6 +14,7 @@ static const char rcsid[] = "@(#)Id: sock.c,v 2.8.4.6 2007/02/17 12:41:51 darren
#include <sys/types.h>
#include <sys/time.h>
#include <sys/stat.h>
#include <stdbool.h>
#if defined(__NetBSD__) && defined(__vax__)
/*
* XXX need to declare boolean_t for _KERNEL <sys/files.h>
@ -33,6 +34,7 @@ typedef int boolean_t;
#if !defined(__osf__)
# ifdef __NetBSD__
# include <machine/lock.h>
# include <sys/mutex.h>
# endif
# define _KERNEL
# define KERNEL