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.

.gitignore

@@ -84,16 +84,12 @@ test-driver
 
 gl_generated_dispatch.c
 gl_generated.h
-gl_generated_vtable_defines.h
 
 glx_generated_dispatch.c
 glx_generated.h
-glx_generated_vtable_defines.h
 
 egl_generated_dispatch.c
 egl_generated.h
-egl_generated_vtable_defines.h
 
 wgl_generated_dispatch.c
 wgl_generated.h
-wgl_generated_vtable_defines.h

include/epoxy/egl.h

@@ -51,7 +51,6 @@ extern "C" {
 #pragma once
 
 #include "epoxy/egl_generated.h"
-#include "epoxy/egl_generated_vtable_defines.h"
 
 bool epoxy_has_egl_extension(EGLDisplay *dpy, const char *extension);
 int epoxy_egl_version(EGLDisplay *dpy);

include/epoxy/gl.h

@@ -78,7 +78,6 @@ extern "C" {
 #endif
 
 #include "epoxy/gl_generated.h"
-#include "epoxy/gl_generated_vtable_defines.h"
 
 bool epoxy_has_gl_extension(const char *extension);
 bool epoxy_is_desktop_gl(void);

include/epoxy/glx.h

@@ -54,7 +54,6 @@ extern "C" {
 #pragma once
 
 #include "epoxy/glx_generated.h"
-#include "epoxy/glx_generated_vtable_defines.h"
 
 bool epoxy_has_glx_extension(Display *dpy, int screen, const char *extension);
 int epoxy_glx_version(Display *dpy, int screen);

include/epoxy/wgl.h

@@ -49,7 +49,6 @@ extern "C" {
 #pragma once
 
 #include "epoxy/wgl_generated.h"
-#include "epoxy/wgl_generated_vtable_defines.h"
 
 bool epoxy_has_wgl_extension(HDC hdc, const char *extension);
 

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

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')