From 53f1bf52f24d3f8da3238f17afc1291efb7190d2 Mon Sep 17 00:00:00 2001 From: Andrea Odetti Date: Sat, 16 Oct 2021 19:18:53 +0100 Subject: [PATCH] Rename interface.h -> linuxinterface.h to avoid case issues. Signed-off-by: Andrea Odetti --- source/frontends/common2/utils.cpp | 1 - source/frontends/libretro/rdirectsound.cpp | 1 + source/frontends/ncurses/main.cpp | 1 - source/frontends/ncurses/world.cpp | 2 +- source/frontends/qt/qapple.cpp | 1 - source/frontends/qt/qdirectsound.cpp | 1 + source/frontends/sdl/main.cpp | 1 - source/frontends/sdl/sdirectsound.cpp | 1 + source/linux/{interface.h => linuxinterface.h} | 0 source/linux/registry.cpp | 1 - source/linux/windows/dsound.cpp | 2 +- 11 files changed, 5 insertions(+), 7 deletions(-) rename source/linux/{interface.h => linuxinterface.h} (100%) diff --git a/source/frontends/common2/utils.cpp b/source/frontends/common2/utils.cpp index b64e6e4f..bbdf98da 100644 --- a/source/frontends/common2/utils.cpp +++ b/source/frontends/common2/utils.cpp @@ -1,6 +1,5 @@ #include "frontends/common2/utils.h" -#include "linux/interface.h" #include "linux/network/uthernet2.h" #include "StdAfx.h" diff --git a/source/frontends/libretro/rdirectsound.cpp b/source/frontends/libretro/rdirectsound.cpp index 9786288b..a2d94052 100644 --- a/source/frontends/libretro/rdirectsound.cpp +++ b/source/frontends/libretro/rdirectsound.cpp @@ -2,6 +2,7 @@ #include "frontends/libretro/environment.h" #include "linux/windows/dsound.h" +#include "linux/linuxinterface.h" #include #include diff --git a/source/frontends/ncurses/main.cpp b/source/frontends/ncurses/main.cpp index 8da1e4be..d9213348 100644 --- a/source/frontends/ncurses/main.cpp +++ b/source/frontends/ncurses/main.cpp @@ -17,7 +17,6 @@ #include "linux/benchmark.h" #include "linux/paddle.h" -#include "linux/interface.h" #include "linux/context.h" #include "frontends/common2/fileregistry.h" #include "frontends/common2/programoptions.h" diff --git a/source/frontends/ncurses/world.cpp b/source/frontends/ncurses/world.cpp index 051b91e2..880490c4 100644 --- a/source/frontends/ncurses/world.cpp +++ b/source/frontends/ncurses/world.cpp @@ -6,7 +6,7 @@ #include "Log.h" -#include "linux/interface.h" +#include "linux/linuxinterface.h" #include "linux/keyboard.h" #include "frontends/ncurses/nframe.h" diff --git a/source/frontends/qt/qapple.cpp b/source/frontends/qt/qapple.cpp index 628b44a1..bb6a6324 100644 --- a/source/frontends/qt/qapple.cpp +++ b/source/frontends/qt/qapple.cpp @@ -27,7 +27,6 @@ #include "linux/benchmark.h" #include "linux/version.h" #include "linux/paddle.h" -#include "linux/interface.h" #include "linux/context.h" #include "emulator.h" diff --git a/source/frontends/qt/qdirectsound.cpp b/source/frontends/qt/qdirectsound.cpp index c469fef6..72d05bc2 100644 --- a/source/frontends/qt/qdirectsound.cpp +++ b/source/frontends/qt/qdirectsound.cpp @@ -3,6 +3,7 @@ #include "loggingcategory.h" #include "qdirectsound.h" #include "linux/windows/dsound.h" +#include "linux/linuxinterface.h" #include #include diff --git a/source/frontends/sdl/main.cpp b/source/frontends/sdl/main.cpp index d16d73b2..e6aa8751 100644 --- a/source/frontends/sdl/main.cpp +++ b/source/frontends/sdl/main.cpp @@ -5,7 +5,6 @@ #include #include "StdAfx.h" -#include "linux/interface.h" #include "linux/benchmark.h" #include "linux/context.h" #include "linux/network/uthernet2.h" diff --git a/source/frontends/sdl/sdirectsound.cpp b/source/frontends/sdl/sdirectsound.cpp index 653a5b1a..64fcf9ae 100644 --- a/source/frontends/sdl/sdirectsound.cpp +++ b/source/frontends/sdl/sdirectsound.cpp @@ -1,6 +1,7 @@ #include "frontends/sdl/sdirectsound.h" #include "linux/windows/dsound.h" +#include "linux/linuxinterface.h" #include diff --git a/source/linux/interface.h b/source/linux/linuxinterface.h similarity index 100% rename from source/linux/interface.h rename to source/linux/linuxinterface.h diff --git a/source/linux/registry.cpp b/source/linux/registry.cpp index 49b94e2d..ddaa71e6 100644 --- a/source/linux/registry.cpp +++ b/source/linux/registry.cpp @@ -1,6 +1,5 @@ #include "linux/windows/stringcb.h" #include "linux/registry.h" -#include "linux/interface.h" #include "Log.h" diff --git a/source/linux/windows/dsound.cpp b/source/linux/windows/dsound.cpp index fbf66aeb..17980a36 100644 --- a/source/linux/windows/dsound.cpp +++ b/source/linux/windows/dsound.cpp @@ -1,6 +1,6 @@ #include "linux/windows/dsound.h" #include "linux/windows/winerror.h" -#include "linux/interface.h" +#include "linux/linuxinterface.h" #include