diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2010-05-23 15:04:20 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2010-05-23 15:04:20 +0000 |
| commit | b2ee6ccfa6d001db27946ca9d8af0d97fd1f39db (patch) | |
| tree | 5f14ad03f809f0a7aab6f39f97a6508ae1824f86 | |
| parent | 4e16b474285809b8cca767c11b345381ee4b06c9 (diff) | |
luna88k moves to defining __luna88k__ instead
| -rw-r--r-- | sys/arch/luna88k/conf/Makefile.luna88k | 4 | ||||
| -rw-r--r-- | sys/dev/wsfont/wsfont.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sys/arch/luna88k/conf/Makefile.luna88k b/sys/arch/luna88k/conf/Makefile.luna88k index 8955607d4a7..8befb0b9232 100644 --- a/sys/arch/luna88k/conf/Makefile.luna88k +++ b/sys/arch/luna88k/conf/Makefile.luna88k @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.luna88k,v 1.27 2010/04/28 15:31:33 deraadt Exp $ +# $OpenBSD: Makefile.luna88k,v 1.28 2010/05/23 15:04:19 deraadt Exp $ # For instructions on building kernels consult the config(8) and options(4) # manual pages. @@ -25,7 +25,7 @@ _machdir?= $S/arch/${_mach} _archdir?= $S/arch/${_arch} INCLUDES= -nostdinc -I. -I$S -I$S/arch -CPPFLAGS= ${INCLUDES} ${IDENT} ${PARAM} -D_KERNEL -D${_mach} -Dm88k +CPPFLAGS= ${INCLUDES} ${IDENT} ${PARAM} -D_KERNEL -D__${_mach}__ CWARNFLAGS= -Wall -Werror -Wmissing-prototypes \ -Wno-uninitialized -Wno-format -Wno-main -Wstrict-prototypes \ -Wstack-larger-than-2047 -Wvariable-decl diff --git a/sys/dev/wsfont/wsfont.c b/sys/dev/wsfont/wsfont.c index 3dee94a58d3..3f126111405 100644 --- a/sys/dev/wsfont/wsfont.c +++ b/sys/dev/wsfont/wsfont.c @@ -1,4 +1,4 @@ -/* $OpenBSD: wsfont.c,v 1.24 2009/02/15 17:13:05 chl Exp $ */ +/* $OpenBSD: wsfont.c,v 1.25 2010/05/23 15:04:19 deraadt Exp $ */ /* $NetBSD: wsfont.c,v 1.17 2001/02/07 13:59:24 ad Exp $ */ /*- @@ -102,7 +102,7 @@ #define HAVE_FONT 1 #define FONT_BOLD8x16_ISO1 -#if defined(__sparc__) || defined(__sparc64__) || defined(luna88k) || !defined(SMALL_KERNEL) +#if defined(__sparc__) || defined(__sparc64__) || defined(__luna88k__) || !defined(SMALL_KERNEL) #define FONT_GALLANT12x22 #endif |