Several changes:

- Make all Windows includes lowercase for MinGW cross-compiling from Linux - AbstractUserDatabase: just include WDllDefs instead of own C++11 check - JWt fixes (for new GCC versions)
emweb · Aug 21, 2018 · 2449394 · 2449394
1 parent 91542c6
commit 2449394
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 28 deletions.
diff --git a/src/Wt/Auth/AbstractUserDatabase b/src/Wt/Auth/AbstractUserDatabase
@@ -13,22 +13,9 @@
 #include <Wt/Auth/IssuedToken>
 #include <Wt/Auth/OAuthClient>
 #include <Wt/Auth/WAuthGlobal>
+#include <Wt/WDllDefs.h>
 #include <Wt/Json/Value>
 
-#ifndef WT_CX11
-
-#if defined(__GXX_EXPERIMENTAL_CXX0X__) || __cplusplus >= 201103L
-#define WT_CXX11
-#endif
-
-#ifdef WT_CXX11
-#define WT_CXX11ONLY(x) x
-#else
-#define WT_CXX11ONLY(x)
-#endif
-
-#endif
-
 namespace Wt {
   namespace Auth {
 

diff --git a/src/Wt/Dbo/WDboDllDefs.h b/src/Wt/Dbo/WDboDllDefs.h
@@ -43,7 +43,7 @@
 
 #ifndef WT_CXX11
 
-#if defined(__GXX_EXPERIMENTAL_CXX0X__) || __cplusplus >= 201103L || _MSC_VER >= 1900
+#if (defined(__GXX_EXPERIMENTAL_CXX0X__) || __cplusplus >= 201103L || _MSC_VER >= 1900) && !defined(WT_TARGET_JAVA)
 #define WT_CXX11
 #endif
 

diff --git a/src/Wt/Dbo/backend/MSSQLServer.C b/src/Wt/Dbo/backend/MSSQLServer.C
@@ -8,7 +8,7 @@
 #include "Wt/Dbo/Exception"
 
 #ifdef WT_WIN32
-#include <Windows.h>
+#include <windows.h>
 #endif // WT_WIN32
 #include <sql.h>
 #include <sqlext.h>

diff --git a/src/Wt/WDllDefs.h b/src/Wt/WDllDefs.h
@@ -79,7 +79,7 @@ typedef unsigned __int32 uint32_t;  /* 32 bit unsigned */
 
 #ifndef WT_CXX11
 
-#if defined(__GXX_EXPERIMENTAL_CXX0X__) || __cplusplus >= 201103L || _MSC_VER >= 1900
+#if (defined(__GXX_EXPERIMENTAL_CXX0X__) || __cplusplus >= 201103L || _MSC_VER >= 1900) && !defined(WT_TARGET_JAVA)
 #define WT_CXX11
 #endif
 

diff --git a/src/Wt/WRasterImage-d2d1.C b/src/Wt/WRasterImage-d2d1.C
@@ -31,9 +31,9 @@
 // WIC
 #include <wincodec.h>
 // DirectWrite
-#include <Dwrite.h>
+#include <dwrite.h>
 
-#include <Shlwapi.h> // for SHCreateMemStream
+#include <shlwapi.h> // for SHCreateMemStream
 
 #ifndef M_PI
 #define M_PI 3.14159265358979323846

diff --git a/src/Wt/WServerGLWidget.C b/src/Wt/WServerGLWidget.C
@@ -15,7 +15,7 @@
 
 #ifdef WIN32_GL
 #include <GL/wglew.h>
-#include <Windows.h>
+#include <windows.h>
 #endif
 
 #include "Wt/WApplication"

diff --git a/src/Wt/WTransform.C b/src/Wt/WTransform.C
@@ -593,12 +593,12 @@ bool WTransform::closeTo(const WTransform &other) const
 
   static const double EPS = 1E-12;
 
-  return std::abs(m_[0] - other.m_[0]) <= EPS &&
-         std::abs(m_[1] - other.m_[1]) <= EPS &&
-         std::abs(m_[2] - other.m_[2]) <= EPS &&
-         std::abs(m_[3] - other.m_[3]) <= EPS &&
-         std::abs(m_[4] - other.m_[4]) <= EPS &&
-         std::abs(m_[5] - other.m_[5]) <= EPS;
+  return std::fabs(m_[0] - other.m_[0]) <= EPS &&
+         std::fabs(m_[1] - other.m_[1]) <= EPS &&
+         std::fabs(m_[2] - other.m_[2]) <= EPS &&
+         std::fabs(m_[3] - other.m_[3]) <= EPS &&
+         std::fabs(m_[4] - other.m_[4]) <= EPS &&
+         std::fabs(m_[5] - other.m_[5]) <= EPS;
 }
 
 }
diff --git a/src/isapi/Isapi.C b/src/isapi/Isapi.C
@@ -3,7 +3,7 @@
 #include "IsapiRequest.h"
 
 #include <windows.h>
-#include <WtsApi32.h>
+#include <wtsapi32.h>
 #include <httpext.h>
 
 #include <fstream>

diff --git a/src/isapi/WServer.C b/src/isapi/WServer.C
@@ -12,7 +12,7 @@
 
 #include <boost/algorithm/string.hpp>
 
-#include <Windows.h>
+#include <windows.h>
 #include <fstream>
 
 namespace Wt {