summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorewewukek <ewewukek@gmail.com>2024-01-04 15:09:58 +0300
committerFedja Beader <fedja@protonmail.ch>2024-02-21 22:15:28 +0000
commit9e6069cac80e851cc8af8ef3a3851289d4c92675 (patch)
tree756bc7f7ca312de397c20ee198887d74cf7a4de6
parentf4ecfac28ac822af7732346eca3dad0365f38994 (diff)
downloadmanaplus-9e6069cac80e851cc8af8ef3a3851289d4c92675.tar.gz
manaplus-9e6069cac80e851cc8af8ef3a3851289d4c92675.tar.bz2
manaplus-9e6069cac80e851cc8af8ef3a3851289d4c92675.tar.xz
manaplus-9e6069cac80e851cc8af8ef3a3851289d4c92675.zip
Don't depend on __clang__ and include <ctime> on all non-Windows platforms
-rw-r--r--src/progs/dyecmd/client.cpp6
-rw-r--r--src/resources/wallpaper.cpp6
2 files changed, 4 insertions, 8 deletions
diff --git a/src/progs/dyecmd/client.cpp b/src/progs/dyecmd/client.cpp
index 483451ed6..ec88650c1 100644
--- a/src/progs/dyecmd/client.cpp
+++ b/src/progs/dyecmd/client.cpp
@@ -85,11 +85,9 @@ PRAGMA48(GCC diagnostic pop)
#include <sys/time.h>
#include "fs/specialfolder.h"
#undef ERROR
-#endif // WIN32
-
-#ifdef __clang__
+#else // WIN32
#include <ctime>
-#endif // __clang__
+#endif // WIN32
#ifdef ANDROID
#ifndef USE_SDL2
diff --git a/src/resources/wallpaper.cpp b/src/resources/wallpaper.cpp
index b76556fec..58f76e3b6 100644
--- a/src/resources/wallpaper.cpp
+++ b/src/resources/wallpaper.cpp
@@ -37,11 +37,9 @@
#ifdef WIN32
#include <sys/time.h>
-#endif // WIN32
-
-#ifdef __clang__
+#else // WIN32
#include <ctime>
-#endif // __clang__
+#endif // WIN32
#include "debug.h"