diff options
| author | Francisco Jerez <currojerez@riseup.net> | 2012-05-16 15:43:29 +0200 |
|---|---|---|
| committer | Francisco Jerez <currojerez@riseup.net> | 2012-05-16 18:51:35 +0200 |
| commit | 03e3bc4ba56f1021899a5f773b6ec21893619e3a (patch) | |
| tree | efd449367808e97d23cd77d5c35b459ac12d4527 /src/gallium/auxiliary/pipe-loader/pipe_loader_drm.c | |
| parent | 88a2e2388bfeee66cb6d873558431b0e0af7e316 (diff) | |
| download | external_mesa3d-03e3bc4ba56f1021899a5f773b6ec21893619e3a.zip external_mesa3d-03e3bc4ba56f1021899a5f773b6ec21893619e3a.tar.gz external_mesa3d-03e3bc4ba56f1021899a5f773b6ec21893619e3a.tar.bz2 | |
gallium/auxiliary/pipe-loader: Fix usage of anonymous union.
Anonymous unions aren't part of the C99 standard. Fixes build on GCC
versions older than 4.6.
https://bugs.freedesktop.org/show_bug.cgi?id=50001
Reported-by: Michael Lange <michaell@gmx.org>
Diffstat (limited to 'src/gallium/auxiliary/pipe-loader/pipe_loader_drm.c')
| -rw-r--r-- | src/gallium/auxiliary/pipe-loader/pipe_loader_drm.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/gallium/auxiliary/pipe-loader/pipe_loader_drm.c b/src/gallium/auxiliary/pipe-loader/pipe_loader_drm.c index 7a7e994..518f3da 100644 --- a/src/gallium/auxiliary/pipe-loader/pipe_loader_drm.c +++ b/src/gallium/auxiliary/pipe-loader/pipe_loader_drm.c @@ -78,8 +78,8 @@ find_drm_pci_id(struct pipe_loader_drm_device *ddev) pci_id = udev_device_get_property_value(parent, "PCI_ID"); if (!pci_id || - sscanf(pci_id, "%x:%x", &ddev->base.pci.vendor_id, - &ddev->base.pci.chip_id) != 2) + sscanf(pci_id, "%x:%x", &ddev->base.u.pci.vendor_id, + &ddev->base.u.pci.chip_id) != 2) goto fail; return TRUE; @@ -101,7 +101,7 @@ find_drm_driver_name(struct pipe_loader_drm_device *ddev) int i, j; for (i = 0; driver_map[i].driver; i++) { - if (dev->pci.vendor_id != driver_map[i].vendor_id) + if (dev->u.pci.vendor_id != driver_map[i].vendor_id) continue; if (driver_map[i].num_chips_ids == -1) { @@ -110,7 +110,7 @@ find_drm_driver_name(struct pipe_loader_drm_device *ddev) } for (j = 0; j < driver_map[i].num_chips_ids; j++) { - if (dev->pci.chip_id == driver_map[i].chip_ids[j]) { + if (dev->u.pci.chip_id == driver_map[i].chip_ids[j]) { dev->driver_name = driver_map[i].driver; goto found; } @@ -120,8 +120,8 @@ find_drm_driver_name(struct pipe_loader_drm_device *ddev) return FALSE; found: - debug_printf("driver for %04x:%04x: %s\n", dev->pci.vendor_id, - dev->pci.chip_id, dev->driver_name); + debug_printf("driver for %04x:%04x: %s\n", dev->u.pci.vendor_id, + dev->u.pci.chip_id, dev->driver_name); return TRUE; } |