| Andrew Geissler | bffdb3e | 2020-08-21 16:13:29 -0500 | [diff] [blame] | 1 | Fix build with gcc10 |
| 2 | |
| 3 | Patch from https://src.fedoraproject.org/rpms/fbida/raw/master/f/fbida.gcc10.patch |
| 4 | |
| 5 | Upstream-Status: Pending |
| 6 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 7 | |
| 8 | --- fbida-2.14/fbi.c.org 2020-03-15 17:02:17.944189632 +0100 |
| 9 | +++ fbida-2.14/fbi.c 2020-03-15 17:02:21.880223224 +0100 |
| 10 | @@ -100,7 +100,6 @@ |
| 11 | |
| 12 | /* graphics interface */ |
| 13 | gfxstate *gfx; |
| 14 | -int debug; |
| 15 | |
| 16 | /* framebuffer */ |
| 17 | char *fbdev = NULL; |
| 18 | --- fbida-2.14/filter.c 2020-03-15 16:44:17.159855150 +0100 |
| 19 | +++ fbida-2.14/filter.c 2020-03-15 16:44:27.017941447 +0100 |
| 20 | @@ -6,8 +6,6 @@ |
| 21 | #include "readers.h" |
| 22 | #include "filter.h" |
| 23 | |
| 24 | -int debug = 0; |
| 25 | - |
| 26 | /* ----------------------------------------------------------------------- */ |
| 27 | |
| 28 | static void |
| 29 | --- fbida-2.14/readers.c.org 2020-03-15 17:01:18.692683597 +0100 |
| 30 | +++ fbida-2.14/readers.c 2020-03-15 16:57:19.141632384 +0100 |
| 31 | @@ -6,6 +6,8 @@ |
| 32 | |
| 33 | #include "readers.h" |
| 34 | |
| 35 | +int debug=0; |
| 36 | + |
| 37 | /* ----------------------------------------------------------------------- */ |
| 38 | |
| 39 | void load_bits_lsb(unsigned char *dst, unsigned char *src, int width, |
| 40 | |
| 41 | --- fbida-2.14/viewer.c.org 2020-03-15 17:05:02.991595832 +0100 |
| 42 | +++ fbida-2.14/viewer.c 2020-03-15 17:04:55.424531467 +0100 |
| 43 | @@ -40,7 +40,6 @@ |
| 44 | #define PROCESS_LINES 16 |
| 45 | |
| 46 | -int debug; |
| 47 | Cursor ptrs[POINTER_COUNT]; |
| 48 | |
| 49 | /* ----------------------------------------------------------------------- */ |
| 50 | |
| 51 | --- fbida-2.14/idaconfig.h.org 2020-03-15 17:07:09.239668196 +0100 |
| 52 | +++ fbida-2.14/idaconfig.h 2020-03-15 17:07:21.248770061 +0100 |
| 53 | @@ -17,7 +17,7 @@ |
| 54 | |
| 55 | /* -------------------------------------------------------------------------- */ |
| 56 | |
| 57 | -char *ida_lists; |
| 58 | +extern char *ida_lists; |
| 59 | |
| 60 | void ida_init_config(void); |
| 61 | void ida_read_config(void); |