From 4518b117c99202065d22ed7665ff3f89cde9dd3c Mon Sep 17 00:00:00 2001 From: Bernhard Schelling <14200249+schellingb@users.noreply.github.com> Date: Tue, 20 Jun 2023 00:12:57 +0900 Subject: [PATCH] =?UTF-8?q?Fix=20build=20error=20"conflicting=20types=20fo?= =?UTF-8?q?r=20=E2=80=98drm=5Ffree=E2=80=99"=20Function=20name=20conflicts?= =?UTF-8?q?=20with=20different=20function=20in=20drm=5Ffree=20drm=5Fcommon?= =?UTF-8?q?.h?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gfx/drivers/drm_gfx.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gfx/drivers/drm_gfx.c b/gfx/drivers/drm_gfx.c index deebf894b4..670f365cee 100644 --- a/gfx/drivers/drm_gfx.c +++ b/gfx/drivers/drm_gfx.c @@ -940,7 +940,7 @@ static void drm_get_poke_interface(void *data, *iface = &drm_poke_interface; } -static void drm_free(void *data) +static void drm_gfx_free(void *data) { struct drm_video *_drmvars = data; @@ -971,7 +971,7 @@ video_driver_t video_drm = { drm_suppress_screensaver, NULL, /* has_windowed */ drm_set_shader, - drm_free, + drm_gfx_free, "drm", NULL, /* set_viewport */ NULL, /* set_rotation */