diff options
| author | Vinson Lee <vlee@freedesktop.org> | 2020-01-31 22:03:42 -0800 |
|---|---|---|
| committer | Marge Bot <eric+marge@anholt.net> | 2020-02-09 06:55:14 +0000 |
| commit | 1924e40adaa8e6c3b5ec8ad5296c96b1195332df (patch) | |
| tree | 36ae645f0610d93bed9de9e5f8dcbf6cb887bb21 /tests/util | |
| parent | e1a5383dbf8c75e65c3caed5133bfae066b77edc (diff) | |
util: Remove extra definition of piglit_automatic.
This patch fixes this build error with GCC 10.
/usr/bin/ld: CMakeFiles/piglitutil_gl.dir/piglit-glx-util.c.o:(.bss+0x0): multiple definition of `piglit_automatic'; CMakeFiles/piglitutil_gl.dir/piglit-framework-gl.c.o:(.bss+0x14): first defined here
Signed-off-by: Vinson Lee <vlee@freedesktop.org>
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
Tested-by: Marge Bot <https://gitlab.freedesktop.org/mesa/piglit/merge_requests/215>
Part-of: <https://gitlab.freedesktop.org/mesa/piglit/merge_requests/215>
Diffstat (limited to 'tests/util')
| -rw-r--r-- | tests/util/piglit-glx-util.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/tests/util/piglit-glx-util.c b/tests/util/piglit-glx-util.c index 860fd7e3b..22c7f64a1 100644 --- a/tests/util/piglit-glx-util.c +++ b/tests/util/piglit-glx-util.c @@ -28,8 +28,6 @@ #include "piglit-util-gl.h" #include "piglit-glx-util.h" -int piglit_automatic; - #ifndef _WIN32 __attribute__((weak)) int piglit_width = 100; __attribute__((weak)) int piglit_height = 100; |