Mesa (master): gallium: Fix a couple of multiple definition warnings.

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Wed Jan 22 09:00:38 UTC 2020


Module: Mesa
Branch: master
Commit: 8e22df3aec9190518a23818be7690ac345f0bc20
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=8e22df3aec9190518a23818be7690ac345f0bc20

Author: Timur Kristóf <timur.kristof at gmail.com>
Date:   Tue Jan 21 16:12:16 2020 +0100

gallium: Fix a couple of multiple definition warnings.

Signed-off-by: Timur Kristóf <timur.kristof at gmail.com>
Reviewed-by: Marek Olšák <marek.olsak at amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3488>

---

 src/gallium/auxiliary/target-helpers/drm_helper_public.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/gallium/auxiliary/target-helpers/drm_helper_public.h b/src/gallium/auxiliary/target-helpers/drm_helper_public.h
index 82dfe9e2575..ab0fc8d1b1a 100644
--- a/src/gallium/auxiliary/target-helpers/drm_helper_public.h
+++ b/src/gallium/auxiliary/target-helpers/drm_helper_public.h
@@ -4,10 +4,10 @@
 struct pipe_screen;
 struct pipe_screen_config;
 
-const char *iris_driconf_xml;
-const char *radeonsi_driconf_xml;
-const char *v3d_driconf_xml;
-const char *virgl_driconf_xml;
+extern const char *iris_driconf_xml;
+extern const char *radeonsi_driconf_xml;
+extern const char *v3d_driconf_xml;
+extern const char *virgl_driconf_xml;
 
 struct pipe_screen *
 pipe_i915_create_screen(int fd, const struct pipe_screen_config *config);



More information about the mesa-commit mailing list