multiple_user_friendly_id.patch 1.1 KB

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