[gnome-terminal] all: ODR fix
- From: Christian Persch <chpe src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-terminal] all: ODR fix
- Date: Fri, 2 Sep 2022 14:37:16 +0000 (UTC)
commit f85f2a381e5ba9904d00236e46fc72ae31253ff0
Author: Christian Persch <chpe src gnome org>
Date: Fri Sep 2 16:36:42 2022 +0200
all: ODR fix
src/terminal-gdbus.cc | 4 ++++
src/terminal-nautilus.cc | 4 ++++
src/terminal-screen.cc | 4 ++++
3 files changed, 12 insertions(+)
---
diff --git a/src/terminal-gdbus.cc b/src/terminal-gdbus.cc
index 66bff6aa..dc77b457 100644
--- a/src/terminal-gdbus.cc
+++ b/src/terminal-gdbus.cc
@@ -84,11 +84,15 @@ terminal_receiver_impl_set_screen (TerminalReceiverImpl *impl,
/* Class implementation */
+namespace {
+
typedef struct {
TerminalReceiver *receiver;
GDBusMethodInvocation *invocation;
} ExecData;
+} // anon namespace
+
static void
exec_data_free (ExecData *data)
{
diff --git a/src/terminal-nautilus.cc b/src/terminal-nautilus.cc
index 9a3ea78a..d140e69e 100644
--- a/src/terminal-nautilus.cc
+++ b/src/terminal-nautilus.cc
@@ -270,6 +270,8 @@ uri_has_local_path (const char *uri)
/* Nautilus menu item class */
+namespace {
+
typedef struct {
TerminalNautilus *nautilus;
guint32 timestamp;
@@ -279,6 +281,8 @@ typedef struct {
gboolean remote;
} ExecData;
+} // anon namespace
+
static void
exec_data_free (ExecData *data)
{
diff --git a/src/terminal-screen.cc b/src/terminal-screen.cc
index 5a1a1db0..70a7e34a 100644
--- a/src/terminal-screen.cc
+++ b/src/terminal-screen.cc
@@ -64,6 +64,8 @@
#define URL_MATCH_CURSOR_NAME "pointer"
+namespace {
+
typedef struct {
volatile int refcount;
char **argv; /* as passed */
@@ -89,6 +91,8 @@ typedef struct {
GCancellable *cancellable;
} ExecData;
+} // anon namespace
+
typedef struct
{
int tag;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]