Fixed problems with glibc 1.99 on PPC. Thanks, Geert.

diff --git a/ChangeLog b/ChangeLog
index 0b37ee55eb453ab119bf3c817fb7fc5343ba065d..e8c9686aee686343516bb6266677f63a7de03a0d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Sep  2 10:58:01 1998  Martin Mares  <mj@albireo.ucw.cz>
+
+       * setpci.c (pread): Recognize glibc 1.99 numbered as 2.0 on the PPC.
+       (thanks to Geert Uytterhoeven for finding this out)
+
 Fri Jul 17 10:43:30 1998  Martin Mares  <mj@albireo.ucw.cz>
 
        * lspci.c (show_verbose): Print subsystem ID using the new resolver.

diff --git a/README b/README
index 3faa01c53b1d621900336ce8a8f41f5aa91c20bd..e661ff5a3770b299049d2837342b09912868e923 100644 (file)
--- a/README
+++ b/README
@@ -36,5 +36,3 @@ notes and other news: http://atrey.karlin.mff.cuni.cz/~mj/pciutils.html.
 TODO:
 
        - Better displaying of IRQ's generated by both PCI and CardBus bridges.
-
-       - Subsystem vendor and device ID?

diff --git a/setpci.c b/setpci.c
index 166bceed8eafa7f816b9886cee5409fa542e09f7..263b7587337d9b9342f53d2e2ade1f0de047b44d 100644 (file)
--- a/setpci.c
+++ b/setpci.c
@@ -1,5 +1,5 @@
 /*
- *     $Id: setpci.c,v 1.4 1998/06/09 19:22:05 mj Exp $
+ *     $Id: setpci.c,v 1.5 1998/09/02 18:47:42 mj Exp $
  *
  *     Linux PCI Utilities -- Manipulate PCI Configuration Registers
  *
@@ -65,7 +65,7 @@ xmalloc(unsigned int howmuch)
  * As libc doesn't support pread/pwrite yet, we have to call them directly
  * or use lseek/read/write instead.
  */
-#ifdef __GLIBC__
+#if defined(__GLIBC__) && !(defined(__powerpc__) && __GLIBC__ == 2 && __GLIBC_MINOR__ == 0)
 #ifndef SYS_pread
 #define SYS_pread __NR_pread
 #endif