From 389bc2bc6e6410b1b4fc1c470a5c2fce871f7b63 Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Tue, 20 Nov 2018 16:43:41 +0000 Subject: [PATCH] mapi/new: remove duplicate GLvoid/void substitution We already do it a few lines above - drop the duplicate. Note that for consistency sake, we keep the substitution since the GL API is a mixed bad - some use GLvoid while others a normal void. We might want to merge this back in GLVND. Signed-off-by: Emil Velikov Reviewed-by: Erik Faye-Lund --- src/mapi/new/genCommon.py | 1 - 1 file changed, 1 deletion(-) diff --git a/src/mapi/new/genCommon.py b/src/mapi/new/genCommon.py index f4eb1728e95..a9fdbcdc9ee 100644 --- a/src/mapi/new/genCommon.py +++ b/src/mapi/new/genCommon.py @@ -226,7 +226,6 @@ def _fixupTypeName(typeName): # Remove the vendor suffixes from types that have a suffix-less version. rv = re.sub(r"\b(GLhalf|GLintptr|GLsizeiptr|GLint64|GLuint64)(?:ARB|EXT|NV|ATI)\b", r"\1", rv) - rv = re.sub(r"\bGLvoid\b", "void", rv) rv = re.sub(r"\bGLDEBUGPROCKHR\b", "GLDEBUGPROC", rv) # Clear out any leading and trailing whitespace. -- 2.30.2