diff options
| author | Jason Downs <downsj@cvs.openbsd.org> | 1999-10-26 03:43:49 +0000 |
|---|---|---|
| committer | Jason Downs <downsj@cvs.openbsd.org> | 1999-10-26 03:43:49 +0000 |
| commit | 66cfb0e720c28cad98e21ca55eab1d190522382e (patch) | |
| tree | 3e13d71a1bb31ba5efaff89565250a99039a5850 /sys | |
| parent | 343a6a0ed2d4c0d688ae9127aa271716707b2576 (diff) | |
Fix inline function decls to work with C++.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/arch/arc/include/disklabel.h | 6 | ||||
| -rw-r--r-- | sys/arch/i386/include/disklabel.h | 6 | ||||
| -rw-r--r-- | sys/arch/powerpc/include/disklabel.h | 8 |
3 files changed, 17 insertions, 3 deletions
diff --git a/sys/arch/arc/include/disklabel.h b/sys/arch/arc/include/disklabel.h index eaa1ce6d902..9a31a425e2d 100644 --- a/sys/arch/arc/include/disklabel.h +++ b/sys/arch/arc/include/disklabel.h @@ -1,4 +1,4 @@ -/* $OpenBSD: disklabel.h,v 1.14 1999/03/23 16:36:17 millert Exp $ */ +/* $OpenBSD: disklabel.h,v 1.15 1999/10/26 03:43:48 downsj Exp $ */ /* $NetBSD: disklabel.h,v 1.3 1996/03/09 20:52:54 ghudson Exp $ */ /* @@ -90,8 +90,12 @@ struct cpu_disklabel { static __inline u_int32_t get_le __P((void *)); static __inline u_int32_t +#ifdef __cplusplus +get_le(void *p) +#else get_le(p) void *p; +#endif { u_int8_t *_p = (u_int8_t *)p; u_int32_t x; diff --git a/sys/arch/i386/include/disklabel.h b/sys/arch/i386/include/disklabel.h index 7e95e4de125..50e9cc753af 100644 --- a/sys/arch/i386/include/disklabel.h +++ b/sys/arch/i386/include/disklabel.h @@ -1,4 +1,4 @@ -/* $OpenBSD: disklabel.h,v 1.20 1999/03/23 16:36:18 millert Exp $ */ +/* $OpenBSD: disklabel.h,v 1.21 1999/10/26 03:43:48 downsj Exp $ */ /* $NetBSD: disklabel.h,v 1.3 1996/03/09 20:52:54 ghudson Exp $ */ /* @@ -97,8 +97,12 @@ struct cpu_disklabel { static __inline u_int32_t get_le __P((void *)); static __inline u_int32_t +#ifdef __cplusplus +get_le(void *p) +#else get_le(p) void *p; +#endif { u_int8_t *_p = (u_int8_t *)p; u_int32_t x; diff --git a/sys/arch/powerpc/include/disklabel.h b/sys/arch/powerpc/include/disklabel.h index 8056cfb0c46..93e2bd92243 100644 --- a/sys/arch/powerpc/include/disklabel.h +++ b/sys/arch/powerpc/include/disklabel.h @@ -1,4 +1,4 @@ -/* $OpenBSD: disklabel.h,v 1.11 1999/03/23 16:36:18 millert Exp $ */ +/* $OpenBSD: disklabel.h,v 1.12 1999/10/26 03:43:48 downsj Exp $ */ /* * Copyright (c) 1994 Christopher G. Demetriou @@ -88,9 +88,15 @@ struct cpu_disklabel { #define DPSECT(s) ((s) & 0x3f) #define DPCYL(c, s) ((c) + (((s) & 0xc0) << 2)) +static __inline u_int32_t get_le __P((void *p)); + static __inline u_int32_t +#ifdef __cplusplus +get_le(void *p) +#else get_le(p) void *p; +#endif { u_int32_t c; u_int8_t *_p = (u_int8_t *)p; |