diff options
author | Miod Vallat <miod@cvs.openbsd.org> | 2010-02-14 12:30:30 +0000 |
---|---|---|
committer | Miod Vallat <miod@cvs.openbsd.org> | 2010-02-14 12:30:30 +0000 |
commit | 8aa674e462f83ddfa722471991536bc0330e90a0 (patch) | |
tree | 2b024caa95bd8632c66ee7527316baa59120979b | |
parent | 9d738057c2ad3ff22d5190552e182e2206058550 (diff) |
Sync with current state of the tree.
-rw-r--r-- | regress/etc/MAKEDEV/Makefile | 4 | ||||
-rw-r--r-- | regress/lib/libc/strerror/valid.ok | 4 | ||||
-rw-r--r-- | regress/sys/net/pf_print_test.c | 3 |
3 files changed, 6 insertions, 5 deletions
diff --git a/regress/etc/MAKEDEV/Makefile b/regress/etc/MAKEDEV/Makefile index bc46b0ff117..564ce0c1bf4 100644 --- a/regress/etc/MAKEDEV/Makefile +++ b/regress/etc/MAKEDEV/Makefile @@ -1,8 +1,8 @@ -# $OpenBSD: Makefile,v 1.24 2008/05/13 20:44:56 miod Exp $ +# $OpenBSD: Makefile,v 1.25 2010/02/14 12:30:27 miod Exp $ MAKEDEVARCHS+=alpha amd64 armish aviion hp300 hppa hppa64 i386 landisk -MAKEDEVARCHS+=luna88k mac68k macppc mvme68k +MAKEDEVARCHS+=loongson luna88k mac68k macppc mvme68k #MAKEDEVARCHS+=mvmeppc MAKEDEVARCHS+=mvme88k sgi socppc sparc sparc64 vax zaurus diff --git a/regress/lib/libc/strerror/valid.ok b/regress/lib/libc/strerror/valid.ok index ee602a4b132..cbc365c598c 100644 --- a/regress/lib/libc/strerror/valid.ok +++ b/regress/lib/libc/strerror/valid.ok @@ -57,8 +57,8 @@ Operation not permitted Unknown signal: 4294967295 Signal 0 Bus error -User defined signal 2 -Unknown signal: 32 +Thread AST +Unknown signal: 33 Unknown signal: 100 Unknown signal: 2147483647 Unknown signal: 2147483648 diff --git a/regress/sys/net/pf_print_test.c b/regress/sys/net/pf_print_test.c index 1323ecc88b5..17240a487a0 100644 --- a/regress/sys/net/pf_print_test.c +++ b/regress/sys/net/pf_print_test.c @@ -16,7 +16,8 @@ #define INET 1 #define INET6 1 -void pf_print_host(struct pf_addr *, u_int16_t, u_int8_t); +void pf_print_host(struct pf_addr *, u_int16_t, u_int8_t); +#define addlog printf char *ipv6_addrs[] = { "::", |