From 2002bd50464ff29b6b6b7e33e04990b2d1b50acd Mon Sep 17 00:00:00 2001 From: Richard Hughes Date: Sun, 21 Mar 2021 19:51:31 +0000 Subject: [PATCH] trivial: Fix a compile failure with new GLib versions GLib now 'helpfully' includes type_traits in gmacros.h -- which now explodes when compiling with a C++ compiler. --- contrib/ci/qt5-thread-test/qt-thread-test.cpp | 2 -- libfwupd/fwupd-client-sync.h | 4 ++++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/contrib/ci/qt5-thread-test/qt-thread-test.cpp b/contrib/ci/qt5-thread-test/qt-thread-test.cpp index 1f2236f09..daa6cb2e4 100644 --- a/contrib/ci/qt5-thread-test/qt-thread-test.cpp +++ b/contrib/ci/qt5-thread-test/qt-thread-test.cpp @@ -4,9 +4,7 @@ * SPDX-License-Identifier: LGPL-2.1+ */ -extern "C" { #include -} #include #include diff --git a/libfwupd/fwupd-client-sync.h b/libfwupd/fwupd-client-sync.h index c7da3033b..9888fd812 100644 --- a/libfwupd/fwupd-client-sync.h +++ b/libfwupd/fwupd-client-sync.h @@ -8,6 +8,8 @@ #include "fwupd-client.h" +G_BEGIN_DECLS + gboolean fwupd_client_connect (FwupdClient *self, GCancellable *cancellable, GError **error) @@ -225,3 +227,5 @@ GBytes *fwupd_client_upload_bytes (FwupdClient *self, GCancellable *cancellable, GError **error) G_GNUC_WARN_UNUSED_RESULT; + +G_END_DECLS