libpciaccess: fix compilation error on i686/x86_64

This commit is contained in:
Leonid Pliushch 2019-07-23 01:37:00 +03:00 committed by Yaksh Bariya
parent 3bfb4f6289
commit 50317bda57
No known key found for this signature in database
GPG Key ID: F7486BA7D3D27581
1 changed files with 25 additions and 7 deletions

View File

@ -1,21 +1,39 @@
diff -uNr libpciaccess-0.16/src/linux_sysfs.c libpciaccess-0.16.mod/src/linux_sysfs.c
--- libpciaccess-0.16/src/linux_sysfs.c 2019-07-17 19:25:27.000000000 +0300
+++ libpciaccess-0.16.mod/src/linux_sysfs.c 2019-07-23 00:31:23.703286583 +0300
+++ libpciaccess-0.16.mod/src/linux_sysfs.c 2019-07-23 01:36:18.607882465 +0300
@@ -50,7 +50,7 @@
#include <dirent.h>
#include <errno.h>
-#if defined(__i386__) || defined(__x86_64__)
+#if (defined(__i386__) || defined(__x86_64__)) && !defined(__ANDROID__)
#include <sys/io.h>
#else
#define inb(x) -1
@@ -462,7 +462,7 @@
while ( temp_size > 0 ) {
- const ssize_t bytes = pread64( fd, data_bytes, temp_size, offset );
+ const ssize_t bytes = pread( fd, data_bytes, temp_size, offset );
/* If zero bytes were read, then we assume it's the end of the
* config file.
@@ -522,7 +522,7 @@
while ( temp_size > 0 ) {
- const ssize_t bytes = pwrite64( fd, data_bytes, temp_size, offset );
+ const ssize_t bytes = pwrite( fd, data_bytes, temp_size, offset );
/* If zero bytes were written, then we assume it's the end of the
* config file.
@@ -890,7 +890,7 @@
} else {
ret = inl(port + handle->base);
}
-
+
return ret;
}