From c9e3fa6f702d7b814c408f1476e43ce6cdd8f7d8 Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Sun, 1 Mar 2020 17:56:50 +1100
Subject: Clean up includes for glcdfont headers (#7745)

* Clean up includes for glcdfont headers

* Remove pragma once, most of these are not headers

* Missed these
---
 keyboards/comet46/lib/glcdfont.c  | 13 +------------
 keyboards/comet46/lib/keylogger.c |  8 +-------
 2 files changed, 2 insertions(+), 19 deletions(-)

(limited to 'keyboards/comet46/lib')

diff --git a/keyboards/comet46/lib/glcdfont.c b/keyboards/comet46/lib/glcdfont.c
index e912d2233c..361d0c3dc6 100644
--- a/keyboards/comet46/lib/glcdfont.c
+++ b/keyboards/comet46/lib/glcdfont.c
@@ -1,17 +1,7 @@
 // This is the 'classic' fixed-space bitmap font for Adafruit_GFX since 1.0.
 // See gfxfont.h for newer custom bitmap font info.
 
-#ifndef FONT5X7_H
-#define FONT5X7_H
-
-#ifdef __AVR__
- #include <avr/io.h>
- #include <avr/pgmspace.h>
-#elif defined(ESP8266)
- #include <pgmspace.h>
-#else
- #define PROGMEM
-#endif
+#include "progmem.h"
 
 // Standard ASCII 5x7 font
 
@@ -145,4 +135,3 @@ const unsigned char font[] PROGMEM = {
   0x02, 0x01, 0x02, 0x04, 0x02, 0x00,
   0x3C, 0x26, 0x23, 0x26, 0x3C, 0x00
 };
-#endif // FONT5X7_H
diff --git a/keyboards/comet46/lib/keylogger.c b/keyboards/comet46/lib/keylogger.c
index 184f601095..a0abdd79ab 100644
--- a/keyboards/comet46/lib/keylogger.c
+++ b/keyboards/comet46/lib/keylogger.c
@@ -1,11 +1,5 @@
 #include <stdio.h>
-
-#ifdef __AVR__
- #include <avr/io.h>
- #include <avr/pgmspace.h>
-#else
- #define PROGMEM
-#endif
+#include "progmem.h"
 
 #define NUM_USB_HID_KEYCODES 255
 #define LEN_KEYCODE_STR 4
-- 
cgit v1.2.1