Fix windows definitions

Author: glankk

simplecpp.cpp

@@ -3,19 +3,15 @@
  * Copyright (C) 2016-2023 simplecpp team
  */
 
-#if defined(_WIN32) || defined(__CYGWIN__) || defined(__MINGW32__)
-#define SIMPLECPP_WINDOWS
-#define NOMINMAX
-#endif
+#include "simplecpp.h"
 
 #ifdef SIMPLECPP_WINDOWS
-#define _WIN32_WINNT 0x0602
-#include <windows.h>
-#undef ERROR
+#  define _WIN32_WINNT 0x0602
+#  define NOMINMAX
+#  include <windows.h>
+#  undef ERROR
 #endif
 
-#include "simplecpp.h"
-
 #include <algorithm>
 #include <cassert>
 #include <cctype>
@@ -39,17 +35,17 @@
 #include <stdexcept>
 #include <string>
 #ifdef SIMPLECPP_WINDOWS
-#include <mutex>
+#  include <mutex>
 #endif
 #include <unordered_map>
 #include <utility>
 #include <vector>
 
 #ifdef _WIN32
-#include <direct.h>
+#  include <direct.h>
 #else
-#include <sys/stat.h>
-#include <unistd.h>
+#  include <sys/stat.h>
+#  include <unistd.h>
 #endif
 
 static bool isHex(const std::string &s)

simplecpp.h

@@ -6,6 +6,10 @@
 #ifndef simplecppH
 #define simplecppH
 
+#if defined(_WIN32) || defined(__CYGWIN__) || defined(__MINGW32__)
+#  define SIMPLECPP_WINDOWS
+#endif
+
 #include <cctype>
 #include <cstring>
 #include <iosfwd>
@@ -28,7 +32,7 @@
 #  define SIMPLECPP_LIB
 #endif
 
-#ifdef _WIN32
+#ifdef SIMPLECPP_WINDOWS
 #  include <cstdint>
 #else
 #  include <sys/stat.h>