From 313f977224aa3608cc688ac11401e0b04b2236cc Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Mon, 19 Nov 2018 15:51:54 +0000 Subject: [PATCH] mapi/new: reinstate _NO_HIDDEN suffixes in the new generator Strictly speaking we can rework the rest of the code so we do not need those. That said, this will require a series on it's own so let's carry this local quirk for now. Signed-off-by: Emil Velikov Reviewed-by: Erik Faye-Lund --- src/mapi/new/gen_gldispatch_mapi.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/mapi/new/gen_gldispatch_mapi.py b/src/mapi/new/gen_gldispatch_mapi.py index 03fb49a7a29..be7b7495909 100755 --- a/src/mapi/new/gen_gldispatch_mapi.py +++ b/src/mapi/new/gen_gldispatch_mapi.py @@ -139,7 +139,7 @@ def generate_public_stubs(functions): return text def generate_public_entries(functions): - text = "#ifdef MAPI_TMP_PUBLIC_ENTRIES\n" + text = "#ifdef MAPI_TMP_PUBLIC_ENTRIES_NO_HIDDEN\n" for func in functions: retStr = ("return " if func.hasReturn() else "") @@ -158,12 +158,12 @@ GLAPI {f.rt} APIENTRY {f.name}({f.decArgs}) for func in functions: text += " (mapi_func) %s,\n" % (func.name,) text += "};\n" - text += "#undef MAPI_TMP_PUBLIC_ENTRIES\n" - text += "#endif /* MAPI_TMP_PUBLIC_ENTRIES */\n" + text += "#undef MAPI_TMP_PUBLIC_ENTRIES_NO_HIDDEN\n" + text += "#endif /* MAPI_TMP_PUBLIC_ENTRIES_NO_HIDDEN */\n" return text def generate_stub_asm_gcc(functions): - text = "#ifdef MAPI_TMP_STUB_ASM_GCC\n" + text = "#ifdef MAPI_TMP_STUB_ASM_GCC_NO_HIDDEN\n" text += "__asm__(\n" for func in functions: @@ -171,8 +171,8 @@ def generate_stub_asm_gcc(functions): text += '"\\t"STUB_ASM_CODE("%d")"\\n"\n\n' % (func.slot,) text += ");\n" - text += "#undef MAPI_TMP_STUB_ASM_GCC\n" - text += "#endif /* MAPI_TMP_STUB_ASM_GCC */\n" + text += "#undef MAPI_TMP_STUB_ASM_GCC_NO_HIDDEN\n" + text += "#endif /* MAPI_TMP_STUB_ASM_GCC_NO_HIDDEN */\n" return text if (__name__ == "__main__"): -- 2.30.2