summaryrefslogtreecommitdiff
path: root/sys/arch
diff options
context:
space:
mode:
authorJonathan Gray <jsg@cvs.openbsd.org>2012-12-03 07:00:12 +0000
committerJonathan Gray <jsg@cvs.openbsd.org>2012-12-03 07:00:12 +0000
commit656f73dfdbcf0f37957f73cf5938693504bc3d7c (patch)
tree9f044211c4e9b46677d47312f2019f1527cddb85 /sys/arch
parent10baabcaaff8d26000e1bb7740679633982e9104 (diff)
avoid depending on gcc cast as lvalue extension which
was removed in gcc4 ok miod@
Diffstat (limited to 'sys/arch')
-rw-r--r--sys/arch/mvme68k/include/bus.h6
-rw-r--r--sys/arch/mvme88k/include/bus.h6
2 files changed, 8 insertions, 4 deletions
diff --git a/sys/arch/mvme68k/include/bus.h b/sys/arch/mvme68k/include/bus.h
index d561c8a2c15..484b7d476ef 100644
--- a/sys/arch/mvme68k/include/bus.h
+++ b/sys/arch/mvme68k/include/bus.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: bus.h,v 1.8 2011/09/27 20:47:30 miod Exp $ */
+/* $OpenBSD: bus.h,v 1.9 2012/12/03 07:00:11 jsg Exp $ */
/*
* Copyright (c) 2004, Miodrag Vallat.
*
@@ -310,7 +310,9 @@ bus_space_copy_1(bus_space_tag_t tag, bus_space_handle_t h1, bus_addr_t o1,
o1 += h1;
o2 += h2;
while ((int)--count >= 0) {
- *((volatile u_int8_t *)o1)++ = *((volatile u_int8_t *)o2)++;
+ *(volatile u_int8_t *)o1 = *(volatile u_int8_t *)o2;
+ o1++;
+ o2++;
}
}
diff --git a/sys/arch/mvme88k/include/bus.h b/sys/arch/mvme88k/include/bus.h
index 4e807ab639b..13c1d6dcdbc 100644
--- a/sys/arch/mvme88k/include/bus.h
+++ b/sys/arch/mvme88k/include/bus.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: bus.h,v 1.11 2011/09/27 20:47:30 miod Exp $ */
+/* $OpenBSD: bus.h,v 1.12 2012/12/03 07:00:11 jsg Exp $ */
/*
* Copyright (c) 2004, Miodrag Vallat.
*
@@ -319,7 +319,9 @@ bus_space_copy_1(bus_space_tag_t tag, bus_space_handle_t h1, bus_addr_t o1,
o1 += h1;
o2 += h2;
while ((int)--count >= 0) {
- *((volatile u_int8_t *)o1)++ = *((volatile u_int8_t *)o2)++;
+ *(volatile u_int8_t *)o1 = *(volatile u_int8_t *)o2;
+ o1++;
+ o2++;
}
}