tvheadend-4.2.8-fno-common.patch 1.7 KB

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556
  1. From 1f2a0a59e3acaef88509d3ac899b905c73b7b8f8 Mon Sep 17 00:00:00 2001
  2. From: James Le Cuirot <chewi@gentoo.org>
  3. Date: Fri, 15 May 2020 17:45:30 +0100
  4. Subject: [PATCH] Fix building with -fno-common (default from GCC 10)
  5. ---
  6. src/input.h | 4 ++--
  7. src/input/mpegts.c | 2 ++
  8. src/input/mpegts.h | 2 +-
  9. 3 files changed, 5 insertions(+), 3 deletions(-)
  10. diff --git a/src/input.h b/src/input.h
  11. index a9c96df04..3dce355c6 100644
  12. --- a/src/input.h
  13. +++ b/src/input.h
  14. @@ -133,8 +133,8 @@ void tvh_hardware_delete ( tvh_hardware_t *th );
  15. extern const idclass_t tvh_input_class;
  16. extern const idclass_t tvh_input_instance_class;
  17. -tvh_input_list_t tvh_inputs;
  18. -tvh_hardware_list_t tvh_hardware;
  19. +extern tvh_input_list_t tvh_inputs;
  20. +extern tvh_hardware_list_t tvh_hardware;
  21. #define TVH_INPUT_FOREACH(x) LIST_FOREACH(x, &tvh_inputs, ti_link)
  22. #define TVH_HARDWARE_FOREACH(x) LIST_FOREACH(x, &tvh_hardware, th_link)
  23. diff --git a/src/input/mpegts.c b/src/input/mpegts.c
  24. index e02d491f1..fca4f3429 100644
  25. --- a/src/input/mpegts.c
  26. +++ b/src/input/mpegts.c
  27. @@ -20,6 +20,8 @@
  28. #include "mpegts/fastscan.h"
  29. #include "memoryinfo.h"
  30. +struct mpegts_listeners mpegts_listeners;
  31. +
  32. extern memoryinfo_t mpegts_input_queue_memoryinfo;
  33. extern memoryinfo_t mpegts_input_table_memoryinfo;
  34. diff --git a/src/input/mpegts.h b/src/input/mpegts.h
  35. index 9dda3baca..9c4c57b73 100644
  36. --- a/src/input/mpegts.h
  37. +++ b/src/input/mpegts.h
  38. @@ -1149,7 +1149,7 @@ typedef struct mpegts_listener
  39. void (*ml_mux_delete) (mpegts_mux_t *mm, void *p);
  40. } mpegts_listener_t;
  41. -LIST_HEAD(,mpegts_listener) mpegts_listeners;
  42. +extern LIST_HEAD(mpegts_listeners, mpegts_listener) mpegts_listeners;
  43. #define mpegts_add_listener(ml)\
  44. LIST_INSERT_HEAD(&mpegts_listeners, ml, ml_link)
  45. --
  46. 2.26.2