blob: b639146fa0feda0563e6045b384ab95a4b5e0827 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
|
From 96fcfd2177cce05be0d5faf019261497d8a27338 Mon Sep 17 00:00:00 2001
From: EDEADLINK <31075243+EDEADLINK@users.noreply.github.com>
Date: Sat, 22 May 2021 10:53:02 +0200
Subject: [PATCH] fix multiple definitions of user_friendly_id
---
src/gui_main.c | 3 ++-
src/gui_main.h | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/gui_main.c b/src/gui_main.c
index 54783c4..afcb029 100644
--- a/src/gui_main.c
+++ b/src/gui_main.c
@@ -33,7 +33,7 @@
#include <gtk/gtk.h>
#include <lo/lo.h>
-
+
#include "nekobee_types.h"
#include "nekobee.h"
#include "gui_callbacks.h"
@@ -42,6 +42,7 @@
/* ==== global variables ==== */
+char * user_friendly_id;
char * osc_host_url;
char * osc_self_url;
lo_address osc_host_address;
diff --git a/src/gui_main.h b/src/gui_main.h
index 4c5e787..1ad5775 100644
--- a/src/gui_main.h
+++ b/src/gui_main.h
@@ -28,7 +28,7 @@
#include <lo/lo.h>
#include "nekobee_types.h"
-char *user_friendly_id;
+extern char * user_friendly_id;
extern char * osc_host_url;
extern char * osc_self_url;
extern lo_address osc_host_address;
|
