From 83d7dbc678bff90654436d600893749e3ad6e613 Mon Sep 17 00:00:00 2001 From: eccard Date: Tue, 2 Jun 2020 01:13:03 -0300 Subject: [PATCH 1/2] Fixes build break in linux (#37) --- src/MiniFB_internal.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/MiniFB_internal.h b/src/MiniFB_internal.h index 7ba4062..384b65f 100755 --- a/src/MiniFB_internal.h +++ b/src/MiniFB_internal.h @@ -2,6 +2,7 @@ #include "MiniFB.h" #include "MiniFB_enums.h" +#include "x11/WindowData_X11.h" #define kCall(func, ...) if(window_data && window_data->func) window_data->func((struct mfb_window *) window_data, __VA_ARGS__); #define kUnused(var) (void) var; @@ -18,7 +19,7 @@ extern "C" { #endif extern short int g_keycodes[512]; - void init_keycodes(void); + void init_keycodes(SWindowData_X11 *window_data_x11); void keyboard_default(struct mfb_window *window, mfb_key key, mfb_key_mod mod, bool isPressed); #if defined(__cplusplus) From 698b50c664475ab9e09d574f824774c54b970e41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Aragon=C3=A9s?= <9335325+Darky-Lucera@users.noreply.github.com> Date: Wed, 3 Jun 2020 17:14:09 +0200 Subject: [PATCH 2/2] Revert "Fixes build break in linux (#37)" This reverts commit 83d7dbc678bff90654436d600893749e3ad6e613. --- src/MiniFB_internal.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/MiniFB_internal.h b/src/MiniFB_internal.h index 384b65f..7ba4062 100755 --- a/src/MiniFB_internal.h +++ b/src/MiniFB_internal.h @@ -2,7 +2,6 @@ #include "MiniFB.h" #include "MiniFB_enums.h" -#include "x11/WindowData_X11.h" #define kCall(func, ...) if(window_data && window_data->func) window_data->func((struct mfb_window *) window_data, __VA_ARGS__); #define kUnused(var) (void) var; @@ -19,7 +18,7 @@ extern "C" { #endif extern short int g_keycodes[512]; - void init_keycodes(SWindowData_X11 *window_data_x11); + void init_keycodes(void); void keyboard_default(struct mfb_window *window, mfb_key key, mfb_key_mod mod, bool isPressed); #if defined(__cplusplus)