diff options
author | Chris Robinson <[email protected]> | 2019-07-28 11:28:36 -0700 |
---|---|---|
committer | Chris Robinson <[email protected]> | 2019-07-28 11:28:36 -0700 |
commit | 5428d6acc37e33802b0b66b2f9cdc0a37dd36429 (patch) | |
tree | e8e159f6b612e246a97e23d14f47a25f1996b35d /Alc/backends | |
parent | 659b6d4245b92a7dba3a1b1693db6de8ddf999eb (diff) |
Clean up includes a bit
Trying out the IWYU tool to only include what's necessary in a given file.
Seems to work decently (it'll miss some headers, suggest unnecessary ones, and
make nonsense suggestions for some things, but overall gives a good starting
point), and helps clean out some headers.
Diffstat (limited to 'Alc/backends')
-rw-r--r-- | Alc/backends/alsa.cpp | 31 | ||||
-rw-r--r-- | Alc/backends/dsound.cpp | 5 | ||||
-rw-r--r-- | Alc/backends/null.cpp | 15 | ||||
-rw-r--r-- | Alc/backends/oss.cpp | 37 | ||||
-rw-r--r-- | Alc/backends/wasapi.cpp | 4 | ||||
-rw-r--r-- | Alc/backends/wave.cpp | 22 |
6 files changed, 74 insertions, 40 deletions
diff --git a/Alc/backends/alsa.cpp b/Alc/backends/alsa.cpp index aeb38585..698a4088 100644 --- a/Alc/backends/alsa.cpp +++ b/Alc/backends/alsa.cpp @@ -22,22 +22,33 @@ #include "backends/alsa.h" -#include <cstdlib> -#include <cstdio> -#include <memory.h> - -#include <atomic> -#include <thread> -#include <vector> -#include <string> #include <algorithm> +#include <atomic> +#include <cassert> +#include <cerrno> +#include <chrono> +#include <cstring> +#include <exception> #include <functional> +#include <memory> +#include <string> +#include <thread> +#include <utility> + +#include "AL/al.h" #include "alMain.h" -#include "alu.h" +#include "albyte.h" #include "alconfig.h" -#include "ringbuffer.h" +#include "almalloc.h" +#include "alnumeric.h" +#include "aloptional.h" +#include "alu.h" #include "compat.h" +#include "logging.h" +#include "ringbuffer.h" +#include "threads.h" +#include "vector.h" #include <alsa/asoundlib.h> diff --git a/Alc/backends/dsound.cpp b/Alc/backends/dsound.cpp index 93de3135..5c77df60 100644 --- a/Alc/backends/dsound.cpp +++ b/Alc/backends/dsound.cpp @@ -22,6 +22,9 @@ #include "backends/dsound.h" +#define WIN32_LEAN_AND_MEAN +#include <windows.h> + #include <stdlib.h> #include <stdio.h> #include <memory.h> @@ -34,6 +37,7 @@ #endif #include <atomic> +#include <cassert> #include <thread> #include <string> #include <vector> @@ -44,6 +48,7 @@ #include "alu.h" #include "ringbuffer.h" #include "compat.h" +#include "threads.h" /* MinGW-w64 needs this for some unknown reason now. */ using LPCWAVEFORMATEX = const WAVEFORMATEX*; diff --git a/Alc/backends/null.cpp b/Alc/backends/null.cpp index 121d7700..00a37fda 100644 --- a/Alc/backends/null.cpp +++ b/Alc/backends/null.cpp @@ -22,18 +22,19 @@ #include "backends/null.h" -#include <cstdlib> -#ifdef HAVE_WINDOWS_H -#include <windows.h> -#endif - +#include <exception> +#include <atomic> #include <chrono> -#include <thread> +#include <cstdint> +#include <cstring> #include <functional> +#include <thread> #include "alMain.h" +#include "almalloc.h" #include "alu.h" -#include "compat.h" +#include "logging.h" +#include "threads.h" namespace { diff --git a/Alc/backends/oss.cpp b/Alc/backends/oss.cpp index e5b74334..33075890 100644 --- a/Alc/backends/oss.cpp +++ b/Alc/backends/oss.cpp @@ -22,32 +22,37 @@ #include "backends/oss.h" +#include <fcntl.h> +#include <poll.h> #include <sys/ioctl.h> -#include <sys/types.h> -#include <sys/time.h> #include <sys/stat.h> -#include <fcntl.h> -#include <cstdlib> -#include <cstdio> -#include <cstring> -#include <memory.h> #include <unistd.h> -#include <cerrno> -#include <poll.h> -#include <cmath> -#include <atomic> -#include <thread> -#include <vector> -#include <string> #include <algorithm> +#include <atomic> +#include <cerrno> +#include <cstdio> +#include <cstring> +#include <exception> #include <functional> +#include <memory> +#include <new> +#include <string> +#include <thread> +#include <utility> + +#include "AL/al.h" #include "alMain.h" -#include "alu.h" #include "alconfig.h" +#include "almalloc.h" +#include "alnumeric.h" +#include "aloptional.h" +#include "alu.h" +#include "logging.h" #include "ringbuffer.h" -#include "compat.h" +#include "threads.h" +#include "vector.h" #include <sys/soundcard.h> diff --git a/Alc/backends/wasapi.cpp b/Alc/backends/wasapi.cpp index db4b5e4e..384aaba8 100644 --- a/Alc/backends/wasapi.cpp +++ b/Alc/backends/wasapi.cpp @@ -22,6 +22,9 @@ #include "backends/wasapi.h" +#define WIN32_LEAN_AND_MEAN +#include <windows.h> + #include <stdlib.h> #include <stdio.h> #include <memory.h> @@ -56,6 +59,7 @@ #include "ringbuffer.h" #include "compat.h" #include "converter.h" +#include "threads.h" /* Some headers seem to define these as macros for __uuidof, which is annoying diff --git a/Alc/backends/wave.cpp b/Alc/backends/wave.cpp index d06f36d7..77692686 100644 --- a/Alc/backends/wave.cpp +++ b/Alc/backends/wave.cpp @@ -22,20 +22,28 @@ #include "backends/wave.h" -#include <cstdlib> -#include <cstdio> -#include <memory.h> +#include <algorithm> +#include <atomic> #include <cerrno> - #include <chrono> -#include <thread> -#include <vector> +#include <cstdint> +#include <cstdio> +#include <cstring> +#include <exception> #include <functional> +#include <thread> + +#include "AL/al.h" #include "alMain.h" -#include "alu.h" #include "alconfig.h" +#include "almalloc.h" +#include "alnumeric.h" +#include "alu.h" #include "compat.h" +#include "logging.h" +#include "threads.h" +#include "vector.h" namespace { |