gcc10.patch 1.8 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081
  1. From 1bb8a8aa29845378903f3c690e17c0867c820da2 Mon Sep 17 00:00:00 2001
  2. From: Gerd Hoffmann <kraxel@redhat.com>
  3. Date: Mon, 16 Mar 2020 13:24:12 +0100
  4. Subject: [PATCH] gcc10 build fix
  5. by Adrian Reber <adrian@lisas.de>
  6. ---
  7. fbi.c | 1 -
  8. filter.c | 2 --
  9. idaconfig.h | 2 +-
  10. readers.c | 2 ++
  11. viewer.c | 1 -
  12. 5 files changed, 3 insertions(+), 5 deletions(-)
  13. diff --git a/fbi.c b/fbi.c
  14. index 8882302..8fd9d31 100644
  15. --- a/fbi.c
  16. +++ b/fbi.c
  17. @@ -86,7 +86,6 @@ static int img_mem, max_mem_mb;
  18. /* graphics interface */
  19. gfxstate *gfx;
  20. -int debug;
  21. /* framebuffer */
  22. char *fbdev = NULL;
  23. diff --git a/filter.c b/filter.c
  24. index a75f73a..e20ebc2 100644
  25. --- a/filter.c
  26. +++ b/filter.c
  27. @@ -6,8 +6,6 @@
  28. #include "readers.h"
  29. #include "filter.h"
  30. -int debug = 0;
  31. -
  32. /* ----------------------------------------------------------------------- */
  33. static void
  34. diff --git a/idaconfig.h b/idaconfig.h
  35. index 8d616ef..d09a178 100644
  36. --- a/idaconfig.h
  37. +++ b/idaconfig.h
  38. @@ -17,7 +17,7 @@
  39. /* -------------------------------------------------------------------------- */
  40. -char *ida_lists;
  41. +extern char *ida_lists;
  42. void ida_init_config(void);
  43. void ida_read_config(void);
  44. diff --git a/readers.c b/readers.c
  45. index e94bbcb..1516ed9 100644
  46. --- a/readers.c
  47. +++ b/readers.c
  48. @@ -7,6 +7,8 @@
  49. #include "readers.h"
  50. #include "byteorder.h"
  51. +int debug=0;
  52. +
  53. /* ----------------------------------------------------------------------- */
  54. void load_bits_lsb(unsigned char *dst, unsigned char *src, int width,
  55. diff --git a/viewer.c b/viewer.c
  56. index ab4b31c..02ba807 100644
  57. --- a/viewer.c
  58. +++ b/viewer.c
  59. @@ -38,7 +38,6 @@
  60. #define PROCESS_LINES 16
  61. -int debug;
  62. Cursor ptrs[POINTER_COUNT];
  63. /* ----------------------------------------------------------------------- */
  64. --
  65. GitLab