From 0580638905837650653014fcf1bb5bb2d101e8f5 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Wed, 27 Jan 2016 19:34:45 +0000
Subject: [PATCH] move windows.h include into its own header (to define
 LEAN_AND_MEAN and NOMINMAX in all places)

---
 ostd/filesystem.hh     |  7 ++-----
 ostd/internal/win32.hh | 17 +++++++++++++++++
 ostd/thread.hh         | 10 ++++------
 3 files changed, 23 insertions(+), 11 deletions(-)
 create mode 100644 ostd/internal/win32.hh

diff --git a/ostd/filesystem.hh b/ostd/filesystem.hh
index badd145..7d44e14 100644
--- a/ostd/filesystem.hh
+++ b/ostd/filesystem.hh
@@ -7,12 +7,9 @@
 #define OSTD_FILESYSTEM_HH
 
 #include "ostd/platform.hh"
+#include "ostd/internal/win32.hh"
 
-#ifdef OSTD_PLATFORM_WIN32
-#define WIN32_LEAN_AND_MEAN
-#define NOMINMAX
-#include <windows.h>
-#else
+#ifdef OSTD_PLATFORM_POSIX
 #include <unistd.h>
 #include <dirent.h>
 #include <sys/stat.h>
diff --git a/ostd/internal/win32.hh b/ostd/internal/win32.hh
new file mode 100644
index 0000000..76c5b9d
--- /dev/null
+++ b/ostd/internal/win32.hh
@@ -0,0 +1,17 @@
+/* Windows includes.
+ *
+ * This file is part of OctaSTD. See COPYING.md for futher information.
+ */
+
+#ifndef OSTD_INTERNAL_WIN32_HH
+#define OSTD_INTERNAL_WIN32_HH
+
+#include "ostd/platform.hh"
+
+#ifdef OSTD_PLATFORM_WIN32
+#define WIN32_LEAN_AND_MEAN
+#define NOMINMAX
+#include <windows.h>
+#endif
+
+#endif
\ No newline at end of file
diff --git a/ostd/thread.hh b/ostd/thread.hh
index 9c467a4..eab0bd1 100644
--- a/ostd/thread.hh
+++ b/ostd/thread.hh
@@ -9,16 +9,14 @@
 #include <stdlib.h>
 #include <pthread.h>
 
-#ifndef OSTD_PLATFORM_WIN32
+#include "ostd/platform.hh"
+#include "ostd/internal/win32.hh"
+
+#ifdef OSTD_PLATFORM_POSIX
 #include <unistd.h>
-#else
-#define WIN32_LEAN_AND_MEAN
-#define NOMINMAX
-#include <windows.h>
 #endif
 
 #include "ostd/memory.hh"
-#include "ostd/platform.hh"
 #include "ostd/type_traits.hh"
 #include "ostd/tuple.hh"