diff options
| author | jkh <jkh@FreeBSD.org> | 1994-09-16 11:22:33 +0000 |
|---|---|---|
| committer | jkh <jkh@FreeBSD.org> | 1994-09-16 11:22:33 +0000 |
| commit | 0b553ff0a2a0e0e7894a74f35d6106bbc2c375d9 (patch) | |
| tree | 938e9da14fef73e1deff8412f45e87b7c92ea0f7 | |
| parent | dd1f19bffaba6b86bddb23bc98fceca3afa30563 (diff) | |
| download | FreeBSD-src-0b553ff0a2a0e0e7894a74f35d6106bbc2c375d9.zip FreeBSD-src-0b553ff0a2a0e0e7894a74f35d6106bbc2c375d9.tar.gz | |
Deal with outw being defined - the declaration clashes.
| -rw-r--r-- | sys/amd64/include/cpufunc.h | 4 | ||||
| -rw-r--r-- | sys/i386/include/cpufunc.h | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/sys/amd64/include/cpufunc.h b/sys/amd64/include/cpufunc.h index e512714..970c867 100644 --- a/sys/amd64/include/cpufunc.h +++ b/sys/amd64/include/cpufunc.h @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: cpufunc.h,v 1.21 1994/09/15 16:27:12 paul Exp $ + * $Id: cpufunc.h,v 1.22 1994/09/15 17:55:47 paul Exp $ */ /* @@ -145,7 +145,9 @@ extern void DELAY(int); void setidt __P((int, void (*)(), int, int)); extern u_long kvtop(void *); +#ifndef outw /* If not inline defined */ extern void outw(int /*u_short*/, int /*u_short*/); /* XXX inline!*/ +#endif extern void outsb(int /*u_short*/, void *, size_t); extern void outsw(int /*u_short*/, void *, size_t); extern void insw(int /*u_short*/, void *, size_t); diff --git a/sys/i386/include/cpufunc.h b/sys/i386/include/cpufunc.h index e512714..970c867 100644 --- a/sys/i386/include/cpufunc.h +++ b/sys/i386/include/cpufunc.h @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: cpufunc.h,v 1.21 1994/09/15 16:27:12 paul Exp $ + * $Id: cpufunc.h,v 1.22 1994/09/15 17:55:47 paul Exp $ */ /* @@ -145,7 +145,9 @@ extern void DELAY(int); void setidt __P((int, void (*)(), int, int)); extern u_long kvtop(void *); +#ifndef outw /* If not inline defined */ extern void outw(int /*u_short*/, int /*u_short*/); /* XXX inline!*/ +#endif extern void outsb(int /*u_short*/, void *, size_t); extern void outsw(int /*u_short*/, void *, size_t); extern void insw(int /*u_short*/, void *, size_t); |
