123456789101112131415161718192021222324252627282930313233343536373839404142434445 |
- 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;
|