From 5035c8bd480de7a0e801a7423dd02332c943c77e Mon Sep 17 00:00:00 2001 From: Jonathan Li Date: Sat, 23 Apr 2016 00:09:37 +0100 Subject: [PATCH] utilities: always include wx/crt.h on Linux The header is necessary if the wx3.0 package isn't compiled with wx2.8 backwards compatibility. --- common/include/Utilities/Dependencies.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/common/include/Utilities/Dependencies.h b/common/include/Utilities/Dependencies.h index 80733a2676..2ef212067c 100644 --- a/common/include/Utilities/Dependencies.h +++ b/common/include/Utilities/Dependencies.h @@ -182,9 +182,9 @@ public: #include #include #include - -#if defined(_WIN32) && wxMAJOR_VERSION >= 3 #include + +#if defined(_WIN32) // This deals with a mode_t redefinition conflict. The mode_t doesn't seem to be // used anywhere in w32pthreads, so I've chosen to use the wxWidgets mode_t // (I think it's unsigned int vs signed int)