summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorThomas Hellstrom <thellstrom@vmware.com>2014-01-09 13:28:22 +0100
committerThomas Hellstrom <thellstrom@vmware.com>2014-01-09 14:31:46 +0100
commitd6b179a5addef6456325adf241eb8dcaf8e4c3d6 (patch)
treecb90c1ce334d86b352097c061f70854c808e8a36 /src
parentf37684e7169b9c0ab23ff748d5acacb65fad82f7 (diff)
downloadxf86-video-vmware-d6b179a5addef6456325adf241eb8dcaf8e4c3d6.tar.gz
xf86-video-vmware-d6b179a5addef6456325adf241eb8dcaf8e4c3d6.tar.bz2
xf86-video-vmware-d6b179a5addef6456325adf241eb8dcaf8e4c3d6.zip
vmware: Fix build errors and warnings
A previous commit and the hosted merge unfortunately brought in some build errors / warnings on early X servers. 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.c1
-rw-r--r--src/vmwarevideo.c4
2 files changed, 3 insertions, 2 deletions
diff --git a/src/vmware_bootstrap.c b/src/vmware_bootstrap.c
index 57f8ae9..ed6c740 100644
--- a/src/vmware_bootstrap.c
+++ b/src/vmware_bootstrap.c
@@ -34,6 +34,7 @@
#include "xf86Pci.h" /* pci */
#include "vm_device_version.h"
#include "vmware_bootstrap.h"
+#include <stdint.h>
#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
#include "xf86Resources.h"
diff --git a/src/vmwarevideo.c b/src/vmwarevideo.c
index 8d7d171..745c71f 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 const XF86VideoEncodingRec vmwareVideoEncodings[] =
+static XF86VideoEncodingRec vmwareVideoEncodings[] =
{
{
0,
@@ -108,7 +108,7 @@ static XF86ImageRec vmwareVideoImages[] =
};
#define VMWARE_VID_NUM_ATTRIBUTES 2
-static const XF86AttributeRec vmwareVideoAttributes[] =
+static XF86AttributeRec vmwareVideoAttributes[] =
{
{
XvGettable | XvSettable,