File 0016-Revert-glx-Fix-build-errors-with-enable-mangling-v2.patch of Package mesa

From 7c00af093b51175ef6b5d683dcdb5b14025fa867 Mon Sep 17 00:00:00 2001
From: Eric Engestrom <eric.engestrom@intel.com>
Date: Thu, 10 Oct 2019 18:13:53 +0100
Subject: [PATCH 16/29] Revert "glx: Fix build errors with --enable-mangling
 (v2)"

This reverts commit a27f2d991b1723c3349623401ce3c8f26dcdb28b.

As of a0829cf23b307ca44ab8 ("GL: drop symbols mangling support"), this
extra complexity isn't needed anymore.

Signed-off-by: Eric Engestrom <eric.engestrom@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/2298>
(cherry picked from commit 5dbbc0f0a824e4addffeb115631a9c5bcb426c29)
---
 .pick_status.json       |  2 +-
 src/glx/glxextensions.h | 10 ++--------
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index 74b8ea8603c..ba442c8aec4 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -1993,7 +1993,7 @@
         "description": "Revert \"glx: Fix build errors with --enable-mangling (v2)\"",
         "nominated": true,
         "nomination_type": 2,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "a27f2d991b1723c3349623401ce3c8f26dcdb28b"
     },
diff --git a/src/glx/glxextensions.h b/src/glx/glxextensions.h
index 999db335717..0af2db04e17 100644
--- a/src/glx/glxextensions.h
+++ b/src/glx/glxextensions.h
@@ -283,17 +283,11 @@ __glXEnableDirectExtension(struct glx_screen *psc, const char *name);
 /* GLX_ALIAS should be used for functions with a non-void return type.
    GLX_ALIAS_VOID is for functions with a void return type. */
 # ifdef HAVE_FUNC_ATTRIBUTE_ALIAS
-/* GLX_ALIAS and GLX_ALIAS_VOID both expand to the macro GLX_ALIAS2. Using the
- * extra expansion means that the name mangling macros in glx_mangle.h will
- * apply before stringification, so the alias attribute will have a string like
- * "mglXFoo" instead of "glXFoo". */
-#  define GLX_ALIAS2(return_type, real_func, proto_args, args, aliased_func) \
+#  define GLX_ALIAS(return_type, real_func, proto_args, args, aliased_func) \
    return_type  real_func  proto_args                                   \
    __attribute__ ((alias( # aliased_func ) ));
-#  define GLX_ALIAS(return_type, real_func, proto_args, args, aliased_func) \
-   GLX_ALIAS2(return_type, real_func, proto_args, args, aliased_func)
 #  define GLX_ALIAS_VOID(real_func, proto_args, args, aliased_func) \
-   GLX_ALIAS2(void, real_func, proto_args, args, aliased_func)
+   GLX_ALIAS(void, real_func, proto_args, args, aliased_func)
 # else
 #  define GLX_ALIAS(return_type, real_func, proto_args, args, aliased_func) \
    return_type  real_func  proto_args                                   \
-- 
2.30.2