CVS commit: xsrc/external/mit/libpciaccess/dist/src

[matthew green]

Module Name:    xsrc
Committed By:   mrg
Date:           Mon Nov  9 06:32:25 UTC 2009

Modified Files:
        xsrc/external/mit/libpciaccess/dist/src: common_bridge.c
            common_device_name.c

Log Message:
merge libpciaccess 0.10.9


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
    xsrc/external/mit/libpciaccess/dist/src/common_bridge.c \
    xsrc/external/mit/libpciaccess/dist/src/common_device_name.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: xsrc/external/mit/libpciaccess/dist/src/common_bridge.c
diff -u xsrc/external/mit/libpciaccess/dist/src/common_bridge.c:1.2 xsrc/external/mit/libpciaccess/dist/src/common_bridge.c:1.3
--- xsrc/external/mit/libpciaccess/dist/src/common_bridge.c:1.2	Wed Jun 10 01:55:53 2009
+++ xsrc/external/mit/libpciaccess/dist/src/common_bridge.c	Mon Nov  9 06:32:25 2009
@@ -273,6 +273,10 @@
 	return ENODEV;
     }
 
+    if (!priv->bridge.pci) {
+	return ENODEV;
+    }
+
     switch ((dev->device_class >> 8) & 0x0ff) {
     case 0x00:
 	/* What to do for host bridges?  I'm pretty sure this isn't right.
Index: xsrc/external/mit/libpciaccess/dist/src/common_device_name.c
diff -u xsrc/external/mit/libpciaccess/dist/src/common_device_name.c:1.2 xsrc/external/mit/libpciaccess/dist/src/common_device_name.c:1.3
--- xsrc/external/mit/libpciaccess/dist/src/common_device_name.c:1.2	Wed Jun 10 01:55:53 2009
+++ xsrc/external/mit/libpciaccess/dist/src/common_device_name.c	Mon Nov  9 06:32:25 2009
@@ -58,7 +58,7 @@
 typedef gzFile pci_id_file;
 
 static pci_id_file
-pci_id_file_open()
+pci_id_file_open(void)
 {
     pci_id_file result;