From: Martin Mares <mj@ucw.cz>
Date: Mon, 24 Jan 2000 15:36:09 +0000 (+0000)
Subject: Don't include <asm/io.h> with glibc.
X-Git-Tag: v3.0.0~238
X-Git-Url: http://mj.ucw.cz/gitweb/?a=commitdiff_plain;h=ebd85b2c17be73129cc3bb2b4087425ace9d2a48;p=pciutils.git

Don't include <asm/io.h> with glibc.

Older versions of glibc include it directly from <sys/io.h>, the newer
ones define the I/O port access stuff themselves, colliding with <asm/io.h>.
---

diff --git a/lib/i386-ports.c b/lib/i386-ports.c
index 0e1acae..a78d98b 100644
--- a/lib/i386-ports.c
+++ b/lib/i386-ports.c
@@ -1,5 +1,5 @@
 /*
- *	$Id: i386-ports.c,v 1.1 1999/01/22 21:05:26 mj Exp $
+ *	$Id: i386-ports.c,v 1.2 2000/01/24 15:36:09 mj Exp $
  *
  *	The PCI Library -- Direct Configuration access via i386 Ports
  *
@@ -8,11 +8,12 @@
  *	Can be freely distributed and used under the terms of the GNU GPL.
  */
 
-#include <asm/io.h>
 #include <unistd.h>
 
 #ifdef __GLIBC__
 #include <sys/io.h>
+#else
+#include <asm/io.h>
 #endif
 
 #include "internal.h"