From bc416ff5905cd5b0707097971bb9a09f5961a8ae Mon Sep 17 00:00:00 2001 From: Solomon Peachy Date: Sat, 10 Apr 2021 10:42:38 -0400 Subject: misc: Only include rbpaths.h and string-extra.h in places that need it (Don't include rbpaths.h in settings.h, or string-extra.h in rbpaths.h) Build-tested on rocker, erosq, mini2g, nano2g, xduoox3, clipzip, dx50, and uisim Change-Id: If32e9c9910f5c8247a655cb64522b84d6d7ccbb5 --- firmware/drivers/audio/erosqlinux_codec.c | 3 --- firmware/export/rbpaths.h | 2 -- firmware/font.c | 1 + 3 files changed, 1 insertion(+), 5 deletions(-) (limited to 'firmware') diff --git a/firmware/drivers/audio/erosqlinux_codec.c b/firmware/drivers/audio/erosqlinux_codec.c index 58104a61e6..abb4fea01f 100644 --- a/firmware/drivers/audio/erosqlinux_codec.c +++ b/firmware/drivers/audio/erosqlinux_codec.c @@ -20,9 +20,6 @@ * KIND, either express or implied. * ****************************************************************************/ -#define RB_FILESYSTEM_OS // VERY important this is before settings.h - // because that pulls in rbpaths.h which breaks open() - //#define LOGF_ENABLE #include "config.h" diff --git a/firmware/export/rbpaths.h b/firmware/export/rbpaths.h index f53d0eb480..a3042d80bc 100644 --- a/firmware/export/rbpaths.h +++ b/firmware/export/rbpaths.h @@ -24,8 +24,6 @@ #include #include "autoconf.h" -#include "string-extra.h" - /* name of directory where configuration, fonts and other data * files are stored */ diff --git a/firmware/font.c b/firmware/font.c index 595410fed2..b8fa1c537f 100644 --- a/firmware/font.c +++ b/firmware/font.c @@ -34,6 +34,7 @@ #include "system.h" #include "kernel.h" #include "lcd.h" +#include "string-extra.h" #include "font.h" #include "file.h" #include "core_alloc.h" -- cgit v1.2.3