Merge branch 'v0.20.x'

2017-12-16 20:50:53 +01:00
parent fbc4bb29dc f1ef9f9d31
commit 6246d36fe6
105 changed files with 270 additions and 240 deletions
--- a/src/util/StringAPI.hxx
+++ b/src/util/StringAPI.hxx
@@ -111,7 +111,7 @@ gcc_nonnull_all
 static inline char *
 UnsafeCopyStringP(char *dest, const char *src) noexcept
 {
-#if defined(WIN32) || defined(__BIONIC__)
+#if defined(_WIN32) || defined(__BIONIC__)
 	/* emulate stpcpy() */
 	UnsafeCopyString(dest, src);
 	return dest + StringLength(dest);