summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFederico G. Schwindt <fgsch@cvs.openbsd.org>2007-10-14 23:08:05 +0000
committerFederico G. Schwindt <fgsch@cvs.openbsd.org>2007-10-14 23:08:05 +0000
commitb67e3138f8c23e1627e4c1fe9f1fbcb82eeb2fc9 (patch)
tree5979316c9ace97c518ba8800d5536612274b196c
parent7011ea1a2d4b82801ad1ca5d383eaf0f99606b0e (diff)
remove tests for EIDRM and ENOMSG existence now that they're in the tree.
miod@ ok.
-rw-r--r--sys/kern/sysv_msg.c10
-rw-r--r--sys/kern/sysv_sem.c7
2 files changed, 2 insertions, 15 deletions
diff --git a/sys/kern/sysv_msg.c b/sys/kern/sysv_msg.c
index d553066de70..706b839fa1b 100644
--- a/sys/kern/sysv_msg.c
+++ b/sys/kern/sysv_msg.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sysv_msg.c,v 1.19 2005/12/13 10:33:14 jsg Exp $ */
+/* $OpenBSD: sysv_msg.c,v 1.20 2007/10/14 23:08:04 fgsch Exp $ */
/* $NetBSD: sysv_msg.c,v 1.19 1996/02/09 19:00:18 christos Exp $ */
/*
@@ -36,14 +36,6 @@
#define DPRINTF(x)
#endif
-/* XXX - OpenBSD doesn't have EIDRM or ENOMSG */
-#ifndef EIDRM
-#define EIDRM EINVAL
-#endif
-#ifndef ENOMSG
-#define ENOMSG EAGAIN
-#endif
-
int nfree_msgmaps; /* # of free map entries */
short free_msgmaps; /* head of linked list of free map entries */
struct msg *free_msghdrs; /* list of free msg headers */
diff --git a/sys/kern/sysv_sem.c b/sys/kern/sysv_sem.c
index fe14f0731e3..68c22ca76b3 100644
--- a/sys/kern/sysv_sem.c
+++ b/sys/kern/sysv_sem.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sysv_sem.c,v 1.34 2007/09/07 15:00:20 art Exp $ */
+/* $OpenBSD: sysv_sem.c,v 1.35 2007/10/14 23:08:04 fgsch Exp $ */
/* $NetBSD: sysv_sem.c,v 1.26 1996/02/09 19:00:25 christos Exp $ */
/*
@@ -40,11 +40,6 @@
#include <sys/mount.h>
#include <sys/syscallargs.h>
-/* SVID defines EIDRM but BSD does not */
-#ifndef EIDRM
-#define EIDRM EINVAL
-#endif
-
#ifdef SEM_DEBUG
#define DPRINTF(x) printf x
#else