diff options
| author | Deepak Singh Rawat <drawat@vmware.com> | 2017-08-07 15:57:56 -0700 |
|---|---|---|
| committer | Sinclair Yeh <syeh@vmware.com> | 2017-08-07 15:57:56 -0700 |
| commit | d8c2f8501307a9c0c65601e897e7d919e42ba0b3 (patch) | |
| tree | 2e011477c8845b049461536e7471c53344d84357 /vmwgfx | |
| parent | ed0fd2f2823917a5dfefa3d3af774d4cdb40f958 (diff) | |
vmware: Fix build warnings
Due to following commit in xserver there were
build warnings, as variables now declared const.
d89b42bda46d36fc0879611cc3b3566957ce36d0
e1e01d2e33c632e395d7e396f73fba8ae606b15a
Added a compat header file.
Signed-off-by: Deepak Rawat <drawat@vmware.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
Reviewed-by: Thomas Hellstrom <thellstrom@vmware.com>:q
Diffstat (limited to 'vmwgfx')
| -rw-r--r-- | vmwgfx/vmwgfx_driver.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/vmwgfx/vmwgfx_driver.c b/vmwgfx/vmwgfx_driver.c index b9ee1db..967dec9 100644 --- a/vmwgfx/vmwgfx_driver.c +++ b/vmwgfx/vmwgfx_driver.c @@ -68,6 +68,7 @@ #include "../src/vmware_bootstrap.h" #include "../src/vmware_common.h" #include "vmwgfx_hosted.h" +#include "common_compat.h" /* * We can't incude svga_types.h due to conflicting types for Bool. @@ -410,23 +411,23 @@ vmwgfx_pre_init_mode(ScrnInfoPtr pScrn, int flags) } if (xf86IsOptionSet(ms->Options, OPTION_GUI_LAYOUT)) { - char *topology = + CONST_ABI_18_0 char *topology = xf86GetOptValString(ms->Options, OPTION_GUI_LAYOUT); ret = FALSE; if (topology) { ret = vmwgfx_set_topology(pScrn, topology, "gui"); - free(topology); + free((void *)topology); } } else if (xf86IsOptionSet(ms->Options, OPTION_STATIC_XINERAMA)) { - char *topology = + CONST_ABI_18_0 char *topology = xf86GetOptValString(ms->Options, OPTION_STATIC_XINERAMA); ret = FALSE; if (topology) { ret = vmwgfx_set_topology(pScrn, topology, "static Xinerama"); - free(topology); + free((void *)topology); } } |