diff --git a/include/epoxy/wgl.h b/include/epoxy/wgl.h index 026d052..2c4682f 100644 --- a/include/epoxy/wgl.h +++ b/include/epoxy/wgl.h @@ -46,6 +46,12 @@ extern "C" { #define __wglxext_h_ #endif +#ifdef UNICODE +#define wglUseFontBitmaps wglUseFontBitmapsW +#else +#define wglUseFontBitmaps wglUseFontBitmapsA +#endif + #include "epoxy/wgl_generated.h" bool epoxy_has_wgl_extension(HDC hdc, const char *extension); diff --git a/src/gen_dispatch.py b/src/gen_dispatch.py index ecf45f1..6aba85d 100755 --- a/src/gen_dispatch.py +++ b/src/gen_dispatch.py @@ -855,7 +855,14 @@ for file in args.files: name = os.path.basename(file).split('.xml')[0] generator = Generator(name) generator.parse(file) + generator.drop_weird_glx_functions() + + # This is an ANSI vs Unicode function, handled specially by + # include/epoxy/wgl.h + if 'wglUseFontBitmaps' in generator.functions: + del generator.functions['wglUseFontBitmaps'] + generator.sort_functions() generator.resolve_aliases() generator.fixup_bootstrap_function('glGetString',