From a01d71fb8c40184aedea0188126f70d6253d8f5f Mon Sep 17 00:00:00 2001 From: En-En <39373446+En-En-Code@users.noreply.github.com> Date: Fri, 25 Oct 2024 09:03:52 -0500 Subject: [PATCH] Needed fixes --- desmume/src/frontend/posix/gtk/utilsGTK.cpp | 1 + desmume/src/frontend/posix/gtk2/utilsGTK.cpp | 3 +++ 2 files changed, 4 insertions(+) diff --git a/desmume/src/frontend/posix/gtk/utilsGTK.cpp b/desmume/src/frontend/posix/gtk/utilsGTK.cpp index e51202d63..b25321bd6 100644 --- a/desmume/src/frontend/posix/gtk/utilsGTK.cpp +++ b/desmume/src/frontend/posix/gtk/utilsGTK.cpp @@ -19,6 +19,7 @@ */ #include "utilsGTK.h" +#include /* A C++ implementation of a GtkCellRendererText subclass which handles diff --git a/desmume/src/frontend/posix/gtk2/utilsGTK.cpp b/desmume/src/frontend/posix/gtk2/utilsGTK.cpp index 831340e12..e8ca5ce0b 100644 --- a/desmume/src/frontend/posix/gtk2/utilsGTK.cpp +++ b/desmume/src/frontend/posix/gtk2/utilsGTK.cpp @@ -19,6 +19,7 @@ */ #include "utilsGTK.h" +#include #include /* @@ -56,11 +57,13 @@ static void desmume_entry_nd_cell_editable_init(GtkCellEditableIface *iface); // As defined in GObject 2.38, which is past the last release of GTK2. // https://gitlab.gnome.org/GNOME/glib/-/blob/main/gobject/gtype.h#L2188 +#ifndef G_ADD_PRIVATE #define G_ADD_PRIVATE(TypeName) \ { \ TypeName##_private_offset = g_type_add_instance_private( \ g_define_type_id, sizeof(TypeName##Private)); \ } +#endif G_DEFINE_TYPE_WITH_CODE(DesmumeEntryNd, desmume_entry_nd, GTK_TYPE_EVENT_BOX, G_ADD_PRIVATE(DesmumeEntryNd) G_IMPLEMENT_INTERFACE(