Move the #defines into the main generated header.

I initially thought I was going to have two sets of defines you chose
from using #include, but that never ended up being necessary.

2 files changed, 1 insertions, 9 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index 52a3840..4c2ef9f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -52,22 +52,18 @@ endif
 
 GENERATED_GL_INCLUDES = \
 	$(builddir)/../include/epoxy/gl_generated.h \
-	$(builddir)/../include/epoxy/gl_generated_vtable_defines.h \
 	$()
 
 GENERATED_GLX_INCLUDES = \
 	$(tuilddir)/../include/epoxy/glx_generated.h \
-	$(builddir)/../include/epoxy/glx_generated_vtable_defines.h \
 	$()
 
 GENERATED_EGL_INCLUDES = \
 	$(tuilddir)/../include/epoxy/egl_generated.h \
-	$(builddir)/../include/epoxy/egl_generated_vtable_defines.h \
 	$()
 
 GENERATED_WGL_INCLUDES = \
 	$(tuilddir)/../include/epoxy/wgl_generated.h \
-	$(builddir)/../include/epoxy/wgl_generated_vtable_defines.h \
 	$()
 
 GENERATED_GL_SOURCE = gl_generated_dispatch.c
diff --git a/src/gen_dispatch.py b/src/gen_dispatch.py
index 0466a06..d93642e 100755
--- a/src/gen_dispatch.py
+++ b/src/gen_dispatch.py
@@ -519,11 +519,8 @@ class Generator(object):
                                                                                   func.args_decl))
             self.outln('')
 
-    def write_proto_define_header(self, file, style):
-        self.write_header_header(file)
-
         for func in self.sorted_functions:
-            self.outln('#define {0} epoxy_{1}{0}'.format(func.name, style))
+            self.outln('#define {0} epoxy_{0}'.format(func.name))
 
     def write_function_ptr_resolver(self, func):
         self.outln('static {0}'.format(func.ptr_type))
@@ -776,5 +773,4 @@ for file in args.files:
     generator.prepare_provider_enum()
 
     generator.write_header(incdir + name + '_generated.h')
-    generator.write_proto_define_header(incdir + name + '_generated_vtable_defines.h', '')
     generator.write_source(srcdir + name + '_generated_dispatch.c')