I had to make the changes shown in the attached diff so that it would
compile cleanly with gcc, and have now pushed this fix to git master
with those changes incorporated.
To ssh://git.freedesktop.org/git/xorg/lib/libpciaccess
3e17f06..d76fb36 master -> master
--
-Alan Coopersmith- [email protected]
Oracle Solaris Engineering - http://blogs.oracle.com/alanc
diff --git a/src/solx_devfs.c b/src/solx_devfs.c
index 05d54a0..433969f 100644
--- a/src/solx_devfs.c
+++ b/src/solx_devfs.c
@@ -81,7 +81,7 @@ typedef struct probe_args {
} probe_args_t;
typedef struct property_info {
- char *name;
+ const char *name;
int value;
} property_info_t;
@@ -204,13 +204,13 @@ probe_device_node(di_node_t node, void *arg)
probe_info_t *pinfo = ((probe_args_t *)arg)->pinfo;
nexus_t *nexus = ((probe_args_t *)arg)->nexus;
property_info_t property_list[] = {
- "class-code", 0,
- "device-id", 0,
- "vendor-id", 0,
- "revision-id", 0,
- "subsystem-vendor-id", 0,
- "subsystem-id", 0,
- };
+ { "class-code", 0 },
+ { "device-id", 0 },
+ { "vendor-id", 0 },
+ { "revision-id", 0},
+ { "subsystem-vendor-id", 0},
+ { "subsystem-id", 0},
+ };
#define NUM_PROPERTIES sizeof(property_list)/sizeof(property_info_t)
len = di_prop_lookup_ints(DDI_DEV_T_ANY, node, "reg", &retbuf);
@@ -751,7 +751,7 @@ pci_device_solx_devfs_map_range(struct pci_device *dev,
err = errno;
(void) fprintf(stderr, "map rom region =%llx failed: %s\n",
- map->base, strerror(errno));
+ (unsigned long long) map->base, strerror(errno));
}
#ifdef __sparc
@@ -831,7 +831,7 @@ pci_device_solx_devfs_read( struct pci_device * dev, void *
data,
cfg_prg.bus_no,
cfg_prg.dev_no,
cfg_prg.func_no,
- cfg_prg.offset);
+ (unsigned long long) cfg_prg.offset);
fprintf(stderr, "Failure cause = %x\n", err);
break;
}
_______________________________________________
[email protected]: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel
