From d660eb35ac3165ecd6365574a09bf0b8a4f4e81b Mon Sep 17 00:00:00 2001 From: Ethan Riley Date: Mon, 10 Aug 2020 20:23:28 +0000 Subject: [PATCH 1/2] add missing header files to glfft --- glfft/glfft_gl_interface.hpp | 2 ++ glfft/glfft_wisdom.cpp | 1 + 2 files changed, 3 insertions(+) diff --git a/glfft/glfft_gl_interface.hpp b/glfft/glfft_gl_interface.hpp index 43929c7..ab06deb 100644 --- a/glfft/glfft_gl_interface.hpp +++ b/glfft/glfft_gl_interface.hpp @@ -30,6 +30,8 @@ extern "C" { #include #include #include + #include + #include } #ifndef GLFFT_GLSL_LANG_STRING diff --git a/glfft/glfft_wisdom.cpp b/glfft/glfft_wisdom.cpp index ad18317..fca9891 100644 --- a/glfft/glfft_wisdom.cpp +++ b/glfft/glfft_wisdom.cpp @@ -20,6 +20,7 @@ #include "glfft_interface.hpp" #include "glfft.hpp" #include +#include /* GLAVA NOTICE: automatic wisdom serialization support may be added at a late date */ #ifdef GLFFT_SERIALIZATION From 1158a396a3ff3d6026dcece5f25fbaa04de2fc29 Mon Sep 17 00:00:00 2001 From: Ethan Riley Date: Mon, 10 Aug 2020 20:24:55 +0000 Subject: [PATCH 2/2] make function pointers static --- glava/glava.c | 4 ++-- glava/glava.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/glava/glava.c b/glava/glava.c index c779153..692b640 100644 --- a/glava/glava.c +++ b/glava/glava.c @@ -76,8 +76,8 @@ static volatile bool reload = false; __attribute__((noreturn, visibility("default"))) void glava_return_builtin(void) { exit(EXIT_SUCCESS); } __attribute__((noreturn, visibility("default"))) void glava_abort_builtin (void) { exit(EXIT_FAILURE); } -__attribute__((noreturn, visibility("default"))) void (*glava_return) (void) = glava_return_builtin; -__attribute__((noreturn, visibility("default"))) void (*glava_abort) (void) = glava_abort_builtin; +__attribute__((noreturn, visibility("default"))) static void (*glava_return) (void) = glava_return_builtin; +__attribute__((noreturn, visibility("default"))) static void (*glava_abort) (void) = glava_abort_builtin; /* Copy installed shaders/configuration from the installed location (usually /etc/xdg). Modules (folders) will be linked instead of diff --git a/glava/glava.h b/glava/glava.h index 570abc3..7b0b9f0 100644 --- a/glava/glava.h +++ b/glava/glava.h @@ -14,8 +14,8 @@ struct glava_renderer; /* External API */ typedef struct glava_renderer* volatile glava_handle; -__attribute__((noreturn, visibility("default"))) void (*glava_abort) (void); -__attribute__((noreturn, visibility("default"))) void (*glava_return) (void); +__attribute__((noreturn, visibility("default"))) static void (*glava_abort) (void); +__attribute__((noreturn, visibility("default"))) static void (*glava_return) (void); __attribute__((visibility("default"))) void glava_assign_external_ctx (void* ctx); __attribute__((visibility("default"))) void glava_entry (int argc, char** argv, glava_handle* ret); __attribute__((visibility("default"))) void glava_terminate (glava_handle* ref);