summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2007-06-16 00:26:34 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2007-06-16 00:26:34 +0000
commitb7483a363fda715999f766cf4f53399af9c0533b (patch)
tree3be50454a786cd434edb4c8982f21babff81c69d
parent8b3d3082c535e107f415e7daf2e81085ed175501 (diff)
When EOVERFLOW was added, it broke the zaurus bootblocks
-rw-r--r--sys/arch/zaurus/stand/zboot/compat_linux.h4
-rw-r--r--sys/arch/zaurus/stand/zboot/unixdev.c6
2 files changed, 5 insertions, 5 deletions
diff --git a/sys/arch/zaurus/stand/zboot/compat_linux.h b/sys/arch/zaurus/stand/zboot/compat_linux.h
index 2662f064eac..9c60d255526 100644
--- a/sys/arch/zaurus/stand/zboot/compat_linux.h
+++ b/sys/arch/zaurus/stand/zboot/compat_linux.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: compat_linux.h,v 1.7 2005/05/24 20:38:20 uwe Exp $ */
+/* $OpenBSD: compat_linux.h,v 1.8 2007/06/16 00:26:33 deraadt Exp $ */
/*
* Copyright (c) 2005 Uwe Stuehler <uwe@bsdx.de>
@@ -42,7 +42,7 @@ struct proc;
#define SEEK_SET 0
#define SEEK_CUR 1
-#define EOVERFLOW 75
+#define LINUX_EOVERFLOW 75
#define termios linux_termios
diff --git a/sys/arch/zaurus/stand/zboot/unixdev.c b/sys/arch/zaurus/stand/zboot/unixdev.c
index d0d52a5e063..8d745feed12 100644
--- a/sys/arch/zaurus/stand/zboot/unixdev.c
+++ b/sys/arch/zaurus/stand/zboot/unixdev.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: unixdev.c,v 1.5 2005/05/24 20:38:20 uwe Exp $ */
+/* $OpenBSD: unixdev.c,v 1.6 2007/06/16 00:26:33 deraadt Exp $ */
/*
* Copyright (c) 1996-1998 Michael Shalayeff
@@ -192,11 +192,11 @@ ulseek(int fd, off_t off, int wh)
while (off > OFFT_OFFSET_MAX) {
off -= OFFT_OFFSET_MAX;
if (ulseek32(fd, OFFT_OFFSET_MAX, SEEK_CUR) < 0 &&
- errno != EOVERFLOW)
+ errno != LINUX_EOVERFLOW)
return -1;
}
r = ulseek32(fd, (long)off, SEEK_CUR);
- if (r == -1 && errno == EOVERFLOW)
+ if (r == -1 && errno == LINUX_EOVERFLOW)
r = off;
} else
r = ulseek32(fd, (long)off, wh);