widelands-dev team mailing list archive

[hessenfarmer <stephan-lutz@xxxxxx>]

hessenfarmer has proposed merging lp:~widelands-dev/widelands/appveyor_fix into lp:widelands.

Commit message:
small fixes to make the CI environments working again

Requested reviews:
  Widelands Developers (widelands-dev)
Related bugs:
  Bug #1789835 in widelands: "Appveyor glbinding incompatible with WL code"
  https://bugs.launchpad.net/widelands/+bug/1789835

For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/appveyor_fix/+merge/354637

fixed __has_include() argument to avoid clang-format introducing spaces.
included boost headers as system headers 
-- 
Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/appveyor_fix into lp:widelands.

=== modified file 'src/graphic/gl/system_headers.h'
--- src/graphic/gl/system_headers.h	2018-09-10 06:11:01 +0000
+++ src/graphic/gl/system_headers.h	2018-09-10 19:47:02 +0000
@@ -41,9 +41,9 @@
 // testing for the presence of glbinding.h to determine whether we have a glbinding version newer
 // then 2.1.4
 #ifdef __has_include
-#if __has_include(<glbinding / glbinding.h>)
+#if __has_include("glbinding/glbinding.h")
+#include <glbinding/ProcAddress.h>
 #include <glbinding/glbinding.h>
-#include <glbinding/ProcAddress.h>
 #define GLBINDING3
 #endif
 #endif

=== modified file 'src/network/crypto.cc'
--- src/network/crypto.cc	2018-09-10 06:11:01 +0000
+++ src/network/crypto.cc	2018-09-10 19:47:02 +0000
@@ -1,9 +1,9 @@
 #include "network/crypto.h"
 
 #if BOOST_VERSION > 106700
-#include "boost/uuid/detail/sha1.hpp"
+#include <boost/uuid/detail/sha1.hpp>
 #else
-#include "boost/uuid/sha1.hpp"
+#include <boost/uuid/sha1.hpp>
 #endif
 
 namespace crypto {

=== modified file 'src/network/crypto.h'
--- src/network/crypto.h	2018-09-06 07:32:28 +0000
+++ src/network/crypto.h	2018-09-10 19:47:02 +0000
@@ -21,8 +21,7 @@
 #define WL_NETWORK_CRYPTO_H
 
 #include <string>
-
-#include "boost/version.hpp"
+#include <boost/version.hpp>
 
 namespace crypto {