Fix ssd1306 compilation on avr-gcc 10 (#9267)

qmk · Sep 17, 2020 · e9b3a12 · e9b3a12
1 parent 424eeb8
commit e9b3a12
Show file tree

Hide file tree

Showing 12 changed files with 18 additions and 6 deletions.
diff --git a/drivers/avr/ssd1306.c b/drivers/avr/ssd1306.c
@@ -11,6 +11,8 @@
 #    include "sendchar.h"
 #    include "timer.h"
 
+struct CharacterMatrix display;
+
 // Set this to 1 to help diagnose early startup problems
 // when testing power-on with ble.  Turn it off otherwise,
 // as the latency of printing most of the debug info messes

diff --git a/drivers/avr/ssd1306.h b/drivers/avr/ssd1306.h
@@ -66,7 +66,7 @@ struct CharacterMatrix {
     bool     dirty;
 };
 
-struct CharacterMatrix display;
+extern struct CharacterMatrix display;
 
 bool iota_gfx_init(void);
 void iota_gfx_task(void);

diff --git a/keyboards/claw44/ssd1306.c b/keyboards/claw44/ssd1306.c
@@ -10,6 +10,8 @@
 #include "sendchar.h"
 #include "timer.h"
 
+struct CharacterMatrix display;
+
 extern const unsigned char font[] PROGMEM;
 
 // Set this to 1 to help diagnose early startup problems

diff --git a/keyboards/claw44/ssd1306.h b/keyboards/claw44/ssd1306.h
@@ -65,7 +65,7 @@ struct CharacterMatrix {
   bool dirty;
 };
 
-struct CharacterMatrix display;
+extern struct CharacterMatrix display;
 
 bool iota_gfx_init(bool rotate);
 void iota_gfx_task(void);

diff --git a/keyboards/comet46/ssd1306.c b/keyboards/comet46/ssd1306.c
@@ -10,6 +10,8 @@
 #include "sendchar.h"
 #include "timer.h"
 
+struct CharacterMatrix display;
+
 extern const unsigned char font[] PROGMEM;
 
 // Set this to 1 to help diagnose early startup problems

diff --git a/keyboards/comet46/ssd1306.h b/keyboards/comet46/ssd1306.h
@@ -65,7 +65,7 @@ struct CharacterMatrix {
   bool dirty;
 };
 
-struct CharacterMatrix display;
+extern struct CharacterMatrix display;
 
 bool iota_gfx_init(bool rotate);
 void iota_gfx_task(void);

diff --git a/keyboards/crkbd/ssd1306.c b/keyboards/crkbd/ssd1306.c
@@ -10,6 +10,8 @@
 #include "sendchar.h"
 #include "timer.h"
 
+struct CharacterMatrix display;
+
 extern const unsigned char font[] PROGMEM;
 
 #ifndef OLED_BLANK_CHAR

diff --git a/keyboards/crkbd/ssd1306.h b/keyboards/crkbd/ssd1306.h
@@ -65,7 +65,7 @@ struct CharacterMatrix {
   bool dirty;
 };
 
-struct CharacterMatrix display;
+extern struct CharacterMatrix display;
 
 bool iota_gfx_init(bool rotate);
 void iota_gfx_task(void);

diff --git a/keyboards/helix/local_drivers/ssd1306.c b/keyboards/helix/local_drivers/ssd1306.c
@@ -16,6 +16,8 @@
 #include "sendchar.h"
 #include "timer.h"
 
+struct CharacterMatrix display;
+
 // Set this to 1 to help diagnose early startup problems
 // when testing power-on with ble.  Turn it off otherwise,
 // as the latency of printing most of the debug info messes

diff --git a/keyboards/helix/local_drivers/ssd1306.h b/keyboards/helix/local_drivers/ssd1306.h
@@ -66,7 +66,7 @@ struct CharacterMatrix {
   bool dirty;
 };
 
-struct CharacterMatrix display;
+extern struct CharacterMatrix display;
 
 bool iota_gfx_init(bool rotate);
 void iota_gfx_task(void);

diff --git a/keyboards/yosino58/ssd1306.c b/keyboards/yosino58/ssd1306.c
@@ -10,6 +10,8 @@
 #include "sendchar.h"
 #include "timer.h"
 
+struct CharacterMatrix display;
+
 extern const unsigned char font[] PROGMEM;
 
 // Set this to 1 to help diagnose early startup problems

diff --git a/keyboards/yosino58/ssd1306.h b/keyboards/yosino58/ssd1306.h
@@ -70,7 +70,7 @@ struct CharacterMatrix {
   bool dirty;
 };
 
-struct CharacterMatrix display;
+extern struct CharacterMatrix display;
 
 bool iota_gfx_init(bool rotate);
 void iota_gfx_task(void);