summaryrefslogtreecommitdiff
path: root/libc
diff options
context:
space:
mode:
authorEric Andersen <andersen@codepoet.org>2006-01-19 02:23:04 +0000
committerEric Andersen <andersen@codepoet.org>2006-01-19 02:23:04 +0000
commit4535d77b5284b5f96ecc038ed85fcfe1bfda6861 (patch)
tree53c542532fef49020372c115ca99b4fffd3be8e5 /libc
parentb9f2b0fde64b36c304a8019a22509402c63d1838 (diff)
Joseph S. Myers writes:
libc/sysdeps/linux/arm/ioperm.c on trunk fails to compile for me because of no declaration of ioperm at the point where libc_hidden_proto(ioperm) requires one. Including <sys/io.h> to get the declaration then shows up that various types are inconsistent with that header; this patch fixes things so that file compiles.
Diffstat (limited to 'libc')
-rw-r--r--libc/sysdeps/linux/arm/ioperm.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/libc/sysdeps/linux/arm/ioperm.c b/libc/sysdeps/linux/arm/ioperm.c
index d85b98e43..a0a4e7d1d 100644
--- a/libc/sysdeps/linux/arm/ioperm.c
+++ b/libc/sysdeps/linux/arm/ioperm.c
@@ -47,6 +47,8 @@
#include <asm/page.h>
#include <sys/sysctl.h>
+#include <sys/io.h>
+
libc_hidden_proto(ioperm)
libc_hidden_proto(readlink)
@@ -232,27 +234,27 @@ outw(unsigned short b, unsigned long int port)
void
-outl(unsigned int b, unsigned long int port)
+outl(unsigned long b, unsigned long int port)
{
*((volatile unsigned long *)(IO_ADDR (port))) = b;
}
-unsigned int
+unsigned char
inb (unsigned long int port)
{
return *((volatile unsigned char *)(IO_ADDR (port)));
}
-unsigned int
+unsigned short int
inw(unsigned long int port)
{
return *((volatile unsigned short *)(IO_ADDR (port)));
}
-unsigned int
+unsigned long int
inl(unsigned long int port)
{
return *((volatile unsigned long *)(IO_ADDR (port)));