diff options
| author |   Samuli Suominen <drac@gentoo.org> | 2007-12-25 14:47:53 +0000 |
|---|---|---|
| committer | Samuli Suominen <drac@gentoo.org> | 2007-12-25 14:47:53 +0000 |
| commit | 5dd4a5238f2cb00caed746572bcb4d3b8439793e (patch) | |
| tree | 0f5b089a91ce002d4d1d53455da117913694422e /app-misc/rio/files | |
| parent | Add 169.07. (diff) | |
| download | gentoo-2-5dd4a5238f2cb00caed746572bcb4d3b8439793e.tar.gz gentoo-2-5dd4a5238f2cb00caed746572bcb4d3b8439793e.tar.bz2 gentoo-2-5dd4a5238f2cb00caed746572bcb4d3b8439793e.zip | |
Applied includes patch from Debian project, fixing asm/io.h vs. sys/io.h problem with sanitized linux headers but most likely also building on Alpha and FreeBSD.
(Portage version: 2.1.4_rc11)
Diffstat (limited to 'app-misc/rio/files')
| -rw-r--r-- | app-misc/rio/files/rio-1.0.7-includes.patch | 65 |
1 files changed, 65 insertions, 0 deletions
diff --git a/app-misc/rio/files/rio-1.0.7-includes.patch b/app-misc/rio/files/rio-1.0.7-includes.patch new file mode 100644 index 000000000000..040505f7e267 --- /dev/null +++ b/app-misc/rio/files/rio-1.0.7-includes.patch @@ -0,0 +1,65 @@ +diff -ur rio107.orig/app.cpp rio107/app.cpp +--- rio107.orig/app.cpp 1999-06-11 19:26:46.000000000 +0300 ++++ rio107/app.cpp 2007-12-25 16:34:39.000000000 +0200 +@@ -43,7 +43,7 @@ + #endif + #define DELETEARRAY delete[] + +-#elif defined(__FreeBSD__) ++#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) + // FreeBSD g++ + #include <unistd.h> + #include <sys/syslimits.h> +diff -ur rio107.orig/rio.cpp rio107/rio.cpp +--- rio107.orig/rio.cpp 1999-06-11 19:26:46.000000000 +0300 ++++ rio107/rio.cpp 2007-12-25 16:34:39.000000000 +0200 +@@ -63,18 +63,36 @@ + #elif defined(__linux__) + // linux g++ + #include <unistd.h> +- #if defined(__alpha) +- #include <sys/io.h> ++ ++ // Changed per Debian bug 50938 ++ //#if defined(__alpha) ++ // #include <sys/io.h> ++ //#else ++ // #include <sys/perm.h> ++ //#endif ++ ++ // Changes per Debian bug 50938 ++ #if !defined(__i386__) ++ #include <sys/io.h> + #else +- #include <sys/perm.h> ++ #include <sys/perm.h> + #endif ++ ++ // Changed per bug Debian bug 88779 ++ #if !defined(__alpha__) ++ #if __GLIBC__ ++ #include <sys/io.h> ++ #else + #include <asm/io.h> ++ #endif ++ #endif ++ + #define OUTPORT(p,v) outb( v, p ) + #define INPORT(p) inb( p ) + #define CLOCK_SECOND CLOCKS_PER_SEC + #define DELETEARRAY delete[] + +-#elif defined(__FreeBSD__) ++#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) + // FreeBSD g++ + #include <fcntl.h> + #include <unistd.h> +@@ -236,7 +254,7 @@ + #endif + + // if FreeBSD +- #if defined(__FreeBSD__) ++ #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) + // request direct access to memory addresses + if ( open("/dev/io", O_RDONLY) == -1 ) + { |