Fixing failing build, gio/gio.h no longer needs extern "C" - Fixes #43 (

#44)
damianatorrpm · May 14, 2021 · c7cc8e1 · c7cc8e1
1 parent befaf07
commit c7cc8e1
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 7 deletions.
diff --git a/dbus_interface.cpp b/dbus_interface.cpp
@@ -8,11 +8,11 @@
 #define DBUS_PLUGIN_WARN TRUE
 
 extern "C" {
-#include <gio/gio.h>
 #include <sys/socket.h>
 #include <sys/types.h>
 };
 
+#include <gio/gio.h>
 #include <algorithm>
 #include <charconv>
 #include <cmath>

diff --git a/dbus_interface_backend.cpp b/dbus_interface_backend.cpp
@@ -15,11 +15,11 @@ extern "C" {
 // #include <xwayland/xwm.h>
 #undef static
 #undef class
-#include <gio/gio.h>
 #include <sys/socket.h>
 #include <wlr/types/wlr_idle.h>
 };
 
+#include <gio/gio.h>
 #include <ctime>
 #include <iostream>
 #include <list>
@@ -2417,4 +2417,4 @@ acquire_bus ()
     owner_id = g_bus_own_name(G_BUS_TYPE_SESSION, "org.wayland.compositor", flags,
                               on_bus_acquired, on_name_acquired, on_name_lost,
                               nullptr, nullptr);
-}
+}
diff --git a/wf-prop.cpp b/wf-prop.cpp
@@ -6,10 +6,7 @@
 #define DBUS_ID "org.wayland.compositor"
 #define DBUS_PATH "/org/wayland/compositor"
 
-extern "C" {
 #include <gio/gio.h>
-};
-
 #include <giomm/application.h>
 #include <giomm/dbusconnection.h>
 #include <giomm/dbusproxy.h>
@@ -586,4 +583,4 @@ main (int argc, char* argv [])
                            g_variant_new("(b)", TRUE), G_DBUS_CALL_FLAGS_NONE, -1,
                            NULL, &error);
     g_main_loop_run(loop);
-}
+}