dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MinGW: Remove direct mingw-std-threads includes

Browse Source
This commit is contained in:
Jonathan G Rennison
2023-12-13 21:08:13 +00:00
parent ba7d2c92d2
commit ea3b991f72
25 changed files with 0 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/debug.cpp
View File

@@ -18,9 +18,6 @@
#include "thread.h" #include "thread.h"
#include <array> #include <array>
#include <mutex> #include <mutex>
#if defined(__MINGW32__)
#include "3rdparty/mingw-std-threads/mingw.mutex.h"
#endif
#if defined(_WIN32) #if defined(_WIN32)
#include "os/windows/win32.h" #include "os/windows/win32.h"

3
src/framerate_gui.cpp
View File

@@ -28,9 +28,6 @@
#include <atomic> #include <atomic>
#include <mutex> #include <mutex>
#if defined(__MINGW32__)
#include "3rdparty/mingw-std-threads/mingw.mutex.h"
#endif
#include <vector> #include <vector>
#include "safeguards.h" #include "safeguards.h"

3
src/genworld.h
View File

@@ -12,9 +12,6 @@
#include "company_type.h" #include "company_type.h"
#include <thread> #include <thread>
#if defined(__MINGW32__)
#include "3rdparty/mingw-std-threads/mingw.thread.h"
#endif
/** Constants related to world generation */ /** Constants related to world generation */
enum LandscapeGenerator { enum LandscapeGenerator {

3
src/mixer.cpp
View File

@@ -19,9 +19,6 @@
#include "safeguards.h" #include "safeguards.h"
#include <mutex> #include <mutex>
#if defined(__MINGW32__)
#include "3rdparty/mingw-std-threads/mingw.mutex.h"
#endif
struct MixerChannel { struct MixerChannel {
/* pointer to allocated buffer memory */ /* pointer to allocated buffer memory */

3
src/music/dmusic.cpp
View File

@@ -26,9 +26,6 @@
#include <dmksctrl.h> #include <dmksctrl.h>
#include <dmusicc.h> #include <dmusicc.h>
#include <mutex> #include <mutex>
#if defined(__MINGW32__)
#include "../3rdparty/mingw-std-threads/mingw.mutex.h"
#endif
#include "../safeguards.h" #include "../safeguards.h"

3
src/music/fluidsynth.cpp
View File

@@ -16,9 +16,6 @@
#include <fluidsynth.h> #include <fluidsynth.h>
#include "../mixer.h" #include "../mixer.h"
#include <mutex> #include <mutex>
#if defined(__MINGW32__)
#include "3rdparty/mingw-std-threads/mingw.mutex.h"
#endif
static struct { static struct {
fluid_settings_t *settings; ///< FluidSynth settings handle fluid_settings_t *settings; ///< FluidSynth settings handle

3
src/music/music_driver.hpp
View File

@@ -14,9 +14,6 @@
#include <memory> #include <memory>
#include <mutex> #include <mutex>
#if defined(__MINGW32__)
#include "../3rdparty/mingw-std-threads/mingw.mutex.h"
#endif
extern std::mutex _music_driver_mutex; extern std::mutex _music_driver_mutex;

4
src/music/win32_m.cpp
View File

@@ -19,10 +19,6 @@
#include "../base_media_base.h" #include "../base_media_base.h"
#include "../core/mem_func.hpp" #include "../core/mem_func.hpp"
#include <mutex> #include <mutex>
#if defined(__MINGW32__)
#include "../3rdparty/mingw-std-threads/mingw.mutex.h"
#include "../3rdparty/mingw-std-threads/mingw.condition_variable.h"
#endif
#include "../safeguards.h" #include "../safeguards.h"

3
src/network/core/os_abstraction.cpp
View File

@@ -20,9 +20,6 @@
#include "os_abstraction.h" #include "os_abstraction.h"
#include "../../string_func.h" #include "../../string_func.h"
#include <mutex> #include <mutex>
#if defined(__MINGW32__)
#include "../../3rdparty/mingw-std-threads/mingw.mutex.h"
#endif
#include "../../safeguards.h" #include "../../safeguards.h"

3
src/network/core/tcp.h
View File

@@ -22,9 +22,6 @@
#include <memory> #include <memory>
#include <vector> #include <vector>
#include <thread> #include <thread>
#if defined(__MINGW32__)
#include "3rdparty/mingw-std-threads/mingw.thread.h"
#endif
/** The states of sending the packets. */ /** The states of sending the packets. */
enum SendPacketsState { enum SendPacketsState {

4
src/network/network_server.cpp
View File

@@ -34,10 +34,6 @@
#include "../3rdparty/monocypher/monocypher.h" #include "../3rdparty/monocypher/monocypher.h"
#include <mutex> #include <mutex>
#include <condition_variable> #include <condition_variable>
#if defined(__MINGW32__)
#include "../3rdparty/mingw-std-threads/mingw.mutex.h"
#include "../3rdparty/mingw-std-threads/mingw.condition_variable.h"
#endif
#include "../safeguards.h" #include "../safeguards.h"

4
src/network/network_survey.h
View File

@@ -12,10 +12,6 @@
#include <condition_variable> #include <condition_variable>
#include <mutex> #include <mutex>
#if defined(__MINGW32__)
#include "../3rdparty/mingw-std-threads/mingw.condition_variable.h"
#include "../3rdparty/mingw-std-threads/mingw.mutex.h"
#endif
#include "core/http.h" #include "core/http.h"
/** /**

4
src/newgrf_config.cpp
View File

@@ -30,10 +30,6 @@
#include "thread.h" #include "thread.h"
#include <mutex> #include <mutex>
#include <condition_variable> #include <condition_variable>
#if defined(__MINGW32__)
#include "3rdparty/mingw-std-threads/mingw.mutex.h"
#include "3rdparty/mingw-std-threads/mingw.condition_variable.h"
#endif
#include "safeguards.h" #include "safeguards.h"

3
src/openttd.cpp
View File

@@ -101,9 +101,6 @@
#include <atomic> #include <atomic>
#include <mutex> #include <mutex>
#if defined(__MINGW32__)
#include "3rdparty/mingw-std-threads/mingw.mutex.h"
#endif
#include <stdarg.h> #include <stdarg.h>
#include <system_error> #include <system_error>

4
src/os/windows/survey_win.cpp
View File

@@ -15,10 +15,6 @@
#include <thread> #include <thread>
#include <windows.h> #include <windows.h>
#if defined(__MINGW32__)
#include "../../3rdparty/mingw-std-threads/mingw.thread.h"
#endif
#include "../../safeguards.h" #include "../../safeguards.h"
extern std::string SurveyMemoryToText(uint64_t memory); extern std::string SurveyMemoryToText(uint64_t memory);

4
src/os/windows/win32.cpp
View File

@@ -34,10 +34,6 @@
#include <array> #include <array>
#include <map> #include <map>
#include <mutex> #include <mutex>
#if defined(__MINGW32__)
#include "../../3rdparty/mingw-std-threads/mingw.mutex.h"
#endif
#include "../../safeguards.h" #include "../../safeguards.h"

4
src/sl/saveload.cpp
View File

@@ -66,10 +66,6 @@
#include "../thread.h" #include "../thread.h"
#include <mutex> #include <mutex>
#include <condition_variable> #include <condition_variable>
#if defined(__MINGW32__)
#include "../3rdparty/mingw-std-threads/mingw.mutex.h"
#include "../3rdparty/mingw-std-threads/mingw.condition_variable.h"
#endif
#include "../safeguards.h" #include "../safeguards.h"

4
src/thread.h
View File

@@ -15,10 +15,6 @@
#include <system_error> #include <system_error>
#include <thread> #include <thread>
#include <mutex> #include <mutex>
#if defined(__MINGW32__)
#include "3rdparty/mingw-std-threads/mingw.thread.h"
#include "3rdparty/mingw-std-threads/mingw.mutex.h"
#endif
/** /**
* Sleep on the current thread for a defined time. * Sleep on the current thread for a defined time.

4
src/video/sdl2_default_v.cpp
View File

@@ -26,10 +26,6 @@
#include <SDL.h> #include <SDL.h>
#include <mutex> #include <mutex>
#include <condition_variable> #include <condition_variable>
#if defined(__MINGW32__)
#include "../3rdparty/mingw-std-threads/mingw.mutex.h"
#include "../3rdparty/mingw-std-threads/mingw.condition_variable.h"
#endif
#ifdef __EMSCRIPTEN__ #ifdef __EMSCRIPTEN__
# include <emscripten.h> # include <emscripten.h>
# include <emscripten/html5.h> # include <emscripten/html5.h>

4
src/video/sdl2_opengl_v.cpp
View File

@@ -30,10 +30,6 @@
#include <SDL.h> #include <SDL.h>
#include <mutex> #include <mutex>
#include <condition_variable> #include <condition_variable>
#if defined(__MINGW32__)
#include "../3rdparty/mingw-std-threads/mingw.mutex.h"
#include "../3rdparty/mingw-std-threads/mingw.condition_variable.h"
#endif
#include <GL/gl.h> #include <GL/gl.h>
#include "../3rdparty/opengl/glext.h" #include "../3rdparty/opengl/glext.h"
#include "opengl.h" #include "opengl.h"

3
src/video/sdl2_v.h
View File

@@ -11,9 +11,6 @@
#define VIDEO_SDL_H #define VIDEO_SDL_H
#include <condition_variable> #include <condition_variable>
#if defined(__MINGW32__)
#include "../3rdparty/mingw-std-threads/mingw.condition_variable.h"
#endif
#include "video_driver.hpp" #include "video_driver.hpp"
#include <vector> #include <vector>

5
src/video/video_driver.hpp
View File

@@ -23,11 +23,6 @@
#include <thread> #include <thread>
#include <vector> #include <vector>
#include <functional> #include <functional>
#if defined(__MINGW32__)
#include "../3rdparty/mingw-std-threads/mingw.mutex.h"
#include "../3rdparty/mingw-std-threads/mingw.condition_variable.h"
#include "../3rdparty/mingw-std-threads/mingw.thread.h"
#endif
extern std::string _ini_videodriver; extern std::string _ini_videodriver;
extern std::vector<Dimension> _resolutions; extern std::vector<Dimension> _resolutions;

4
src/video/win32_v.h
View File

@@ -13,10 +13,6 @@
#include "video_driver.hpp" #include "video_driver.hpp"
#include <mutex> #include <mutex>
#include <condition_variable> #include <condition_variable>
#if defined(__MINGW32__)
#include "../3rdparty/mingw-std-threads/mingw.mutex.h"
#include "../3rdparty/mingw-std-threads/mingw.condition_variable.h"
#endif
#include <vector> #include <vector>
/** Base class for Windows video drivers. */ /** Base class for Windows video drivers. */

4
src/viewport.cpp
View File

@@ -125,10 +125,6 @@
#include <mutex> #include <mutex>
#include <condition_variable> #include <condition_variable>
#if defined(__MINGW32__)
#include "3rdparty/mingw-std-threads/mingw.mutex.h"
#include "3rdparty/mingw-std-threads/mingw.condition_variable.h"
#endif
#include "table/strings.h" #include "table/strings.h"
#include "table/string_colours.h" #include "table/string_colours.h"

4
src/worker_thread.h
View File

@@ -13,10 +13,6 @@
#include "core/ring_buffer_queue.hpp" #include "core/ring_buffer_queue.hpp"
#include <mutex> #include <mutex>
#include <condition_variable> #include <condition_variable>
#if defined(__MINGW32__)
#include "3rdparty/mingw-std-threads/mingw.mutex.h"
#include "3rdparty/mingw-std-threads/mingw.condition_variable.h"
#endif
typedef void WorkerJobFunc(void *, void *, void *); typedef void WorkerJobFunc(void *, void *, void *);