diff --git a/src/mapi/mapi_abi.py b/src/mapi/mapi_abi.py index 46adbf38923..1e987714f4e 100644 --- a/src/mapi/mapi_abi.py +++ b/src/mapi/mapi_abi.py @@ -577,13 +577,7 @@ class GLAPIPrinter(ABIPrinter): pass def _get_c_header(self): - header = """#ifndef _GLAPI_TMP_H_ -#define _GLAPI_TMP_H_ - -#include "util/glheader.h" -#endif /* _GLAPI_TMP_H_ */""" - - return header + return '#include "util/glheader.h"\n' class SharedGLAPIPrinter(GLAPIPrinter): """Shared GLAPI API Printer""" @@ -604,12 +598,7 @@ class SharedGLAPIPrinter(GLAPIPrinter): ent.handcode = False def _get_c_header(self): - header = """#ifndef _GLAPI_TMP_H_ -#define _GLAPI_TMP_H_ -#include "util/glheader.h" -#endif /* _GLAPI_TMP_H_ */""" - - return header + return '#include "util/glheader.h"\n' def parse_args(): printers = ['glapi', 'es1api', 'es2api', 'shared-glapi'] diff --git a/src/mapi/new/gen_gldispatch_mapi.py b/src/mapi/new/gen_gldispatch_mapi.py index 5dd40848170..fbd266fe0c0 100755 --- a/src/mapi/new/gen_gldispatch_mapi.py +++ b/src/mapi/new/gen_gldispatch_mapi.py @@ -52,13 +52,7 @@ def _main(): assert(all(functions[i] == allFunctions[i] for i in range(len(functions)))) assert(all(functions[i].slot == i for i in range(len(functions)))) - print(r""" -/* This file is automatically generated by mapi_abi.py. Do not modify. */ - -#ifndef _GLAPI_TMP_H_ -#define _GLAPI_TMP_H_ -#endif /* _GLAPI_TMP_H_ */ -""".lstrip("\n")) + print('/* This file is automatically generated by gen_gldispatch_mapi.py. Do not modify. */\n') print(generate_defines(functions)) if target == "gldispatch":