summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRob Clark <robdclark@gmail.com>2014-05-04 17:22:40 -0400
committerRob Clark <robdclark@gmail.com>2014-05-04 17:25:04 -0400
commitf16b5c842ffd6f80a3091fc893bc2de8162bc49b (patch)
treee0579493032cd9bef19e369f17103ed4caa920d6
parent15c001534587d5e6ab0a3c28a2681164869b2851 (diff)
build fixes
Fixes armsoc_driver.c: In function 'ARMSOCScreenInit': armsoc_driver.c:1067:8: error: assignment discards 'const' qualifier from pointer target type [-Werror] and drmmode_display.c: In function 'drmmode_set_mode_major': drmmode_display.c:357:4: error: passing argument 1 of 'free' discards 'const' qualifier from pointer target type [-Werror] Signed-off-by: Rob Clark <robdclark@gmail.com>
-rw-r--r--src/armsoc_driver.c2
-rw-r--r--src/drmmode_display.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/armsoc_driver.c b/src/armsoc_driver.c
index 590352e..3abb80b 100644
--- a/src/armsoc_driver.c
+++ b/src/armsoc_driver.c
@@ -951,7 +951,7 @@ ARMSOCScreenInit(SCREEN_INIT_ARGS_DECL)
VisualPtr visual;
xf86CrtcConfigPtr xf86_config;
int j;
- char *fbdev;
+ const char *fbdev;
TRACE_ENTER();
diff --git a/src/drmmode_display.c b/src/drmmode_display.c
index b9e59f1..d71b943 100644
--- a/src/drmmode_display.c
+++ b/src/drmmode_display.c
@@ -354,7 +354,7 @@ drmmode_set_mode_major(xf86CrtcPtr crtc, DisplayModePtr mode,
drmmode_crtc->last_good_rotation = crtc->rotation;
if (drmmode_crtc->last_good_mode) {
if (drmmode_crtc->last_good_mode->name)
- free(drmmode_crtc->last_good_mode->name);
+ free((void *)drmmode_crtc->last_good_mode->name);
free(drmmode_crtc->last_good_mode);
}
drmmode_crtc->last_good_mode = xf86DuplicateMode(&crtc->mode);