diff options
| author | Thomas Hellstrom <thellstrom@vmware.com> | 2013-11-28 02:02:20 -0800 |
|---|---|---|
| committer | Thomas Hellstrom <thellstrom@vmware.com> | 2013-12-05 01:01:14 -0800 |
| commit | 7ac45326eccbf3bea9a4a8f95b9662a36ab58eb0 (patch) | |
| tree | d0b3ae79b7a2ab72a4bf5b8d61ec5cedb0f6317d /src | |
| parent | e26dec8f5278df74a102493bf6d2d8444dab5d6d (diff) | |
vmwgfx: Fix some compilation warnings and indentations
Most of the compilation warnings we're seeing are due to bad xorg headers,
but fix the ones we can fix in the driver. Some indentation fixes as well.
Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Reviewed-by: Jakob Bornecrantz <jakob@vmware.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/vmware_bootstrap.c | 2 | ||||
| -rw-r--r-- | src/vmwarevideo.c | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/src/vmware_bootstrap.c b/src/vmware_bootstrap.c index ea5be19..bb58325 100644 --- a/src/vmware_bootstrap.c +++ b/src/vmware_bootstrap.c @@ -256,7 +256,6 @@ VMwarePciProbe (DriverPtr drv, intptr_t match_data) { ScrnInfoPtr scrn = NULL; - EntityInfoPtr entity; scrn = xf86ConfigPciEntity(scrn, 0, entity_num, VMWAREPciChipsets, NULL, NULL, NULL, NULL, NULL); @@ -267,7 +266,6 @@ VMwarePciProbe (DriverPtr drv, scrn->Probe = NULL; } - entity = xf86GetEntityInfo(entity_num); switch (DEVICE_ID(device)) { case PCI_DEVICE_ID_VMWARE_SVGA2: case PCI_DEVICE_ID_VMWARE_SVGA: diff --git a/src/vmwarevideo.c b/src/vmwarevideo.c index 745c71f..8d7d171 100644 --- a/src/vmwarevideo.c +++ b/src/vmwarevideo.c @@ -82,7 +82,7 @@ #define VMWARE_VID_MAX_HEIGHT 2048 #define VMWARE_VID_NUM_ENCODINGS 1 -static XF86VideoEncodingRec vmwareVideoEncodings[] = +static const XF86VideoEncodingRec vmwareVideoEncodings[] = { { 0, @@ -108,7 +108,7 @@ static XF86ImageRec vmwareVideoImages[] = }; #define VMWARE_VID_NUM_ATTRIBUTES 2 -static XF86AttributeRec vmwareVideoAttributes[] = +static const XF86AttributeRec vmwareVideoAttributes[] = { { XvGettable | XvSettable, |