chore(cleanup): ensure -std=c99 -Wall compiles with no warnings

Had some redundant type declarations, but otherwise pretty clean.

Signed-off-by: Steven Noonan <steven@uplinklabs.net>

Author: tycho

src/generator/c/templates/header.h.j2

@@ -306,12 +306,15 @@ extern {{ fs.context_name }} gloam_{{ fs.spec_name }}_context;
 
 /* ---- API declarations ---------------------------------------------------- */
 
+#ifndef GLOAM_DEFINED_CALLBACK_TYPES_
+#define GLOAM_DEFINED_CALLBACK_TYPES_
 /* Opaque function pointer type — the common return type for all load
    callbacks.  Callers cast to the specific PFN type they need. */
 typedef void (*GloamAPIProc)(void);
 
 /* Load function pointer type (GL / EGL / GLX / WGL). */
 typedef GloamAPIProc (*GloamLoadFunc)(const char *name);
+#endif
 {%- if fs.is_vulkan %}
 /* Vulkan command scope — controls which proc-addr entry point the load
    callback should use.  Must match the definition in impl_util.j2. */
@@ -402,3 +405,4 @@ void gloamLoaderResetVulkan(void);
 #endif /* _WIN32 */
 {% endif %}
 #endif /* GLOAM_{{ guard }} */
+

src/generator/c/templates/impl_util.j2

@@ -19,13 +19,6 @@
 #define GLOAM_ARRAYSIZE(x) (sizeof(x) / sizeof((x)[0]))
 #define GLOAM_UNUSED(x)    ((void)(x))
 
-/* Opaque function pointer type — the common return type for all load
-   callbacks.  Callers cast to the specific PFN type they need. */
-typedef void (*GloamAPIProc)(void);
-
-/* Load function pointer type: plain proc-addr callback (GL / EGL / GLX / WGL). */
-typedef GloamAPIProc (*GloamLoadFunc)(const char *name);
-
 /* Contiguous run of pfnArray slots belonging to one feature or extension.
    Used by the range-based PFN loading loop. */
 typedef struct {

src/generator/c/templates/source.c.j2

@@ -51,7 +51,7 @@
    offset table for O(1) indexing.  This avoids one pointer (8 bytes on 64-bit)
    plus one relocation entry (~24 bytes in PIC builds) per command compared to
    the traditional const char * const [] approach. */
-#define kFnCount_{{ fs.spec_name | spec_display }} {{ fs.commands | length }}
+static const uint32_t kFnCount_{{ fs.spec_name | spec_display }} = {{ fs.commands | length }};
 
 static const char kFnNameData_{{ fs.spec_name | spec_display }}[] =
 {%- for cmd in fs.commands %}
@@ -647,6 +647,7 @@ static int gloam_{{ fs.spec_name }}_find_core_{{ api }}({{ u.ctx_arg(', ') }}EGL
 int gloamLoad{{ api | api_display }}Context({{ u.ctx_arg(', ') }}GloamLoadFunc getProcAddr) {
     int version;
     uint32_t i;
+    GLOAM_UNUSED(kFnCount_{{ fs.spec_name | spec_display }});
 
     memset(context, 0, sizeof(*context));
 
@@ -687,6 +688,7 @@ int gloamLoad{{ api | api_display }}(GloamLoadFunc getProcAddr) {
 int gloamLoad{{ api | api_display }}Context({{ u.ctx_arg(', ') }}EGLDisplay display, GloamLoadFunc getProcAddr) {
     int version;
     uint32_t i;
+    GLOAM_UNUSED(kFnCount_{{ fs.spec_name | spec_display }});
 
     memset(context, 0, sizeof(*context));
 
@@ -766,6 +768,8 @@ int gloamLoad{{ api | api_display }}(Display *display, int screen, GloamLoadFunc
 int gloamLoad{{ api | api_display }}Context({{ u.ctx_arg(', ') }}HDC hdc, GloamLoadFunc getProcAddr) {
     int version;
     uint32_t i;
+    GLOAM_UNUSED(kFnCount_{{ fs.spec_name | spec_display }});
+
     memset(context, 0, sizeof(*context));
 
     /* WGL mandatory extensions must be loaded first for extension detection. */
@@ -835,6 +839,7 @@ int gloamLoadVulkanContextUserPtr({{ u.ctx_arg(', ') }}VkInstance instance,
                                    GloamVkUserptrLoadFunc load, void *userptr) {
     int version;
     uint32_t i;
+    GLOAM_UNUSED(kFnCount_{{ fs.spec_name | spec_display }});
     GLOAM_UNUSED(instance);
     GLOAM_UNUSED(device);
 
@@ -901,3 +906,4 @@ int gloamLoadVulkan(VkInstance instance, VkPhysicalDevice physical_device, VkDev
 {% elif fs.spec_name == "wgl" -%}
 #endif /* _WIN32 */
 {% endif %}
+