[glibmm/glibmm-2-64] glib/glibmm/ustring.h: Fix building on Visual Studio 2015
- From: Chun-wei Fan <fanchunwei src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glibmm/glibmm-2-64] glib/glibmm/ustring.h: Fix building on Visual Studio 2015
- Date: Mon, 15 Jun 2020 10:27:22 +0000 (UTC)
commit ed96df5fa32ed543a51401cfc030939210055e14
Author: Chun-wei Fan <fanchunwei src gnome org>
Date: Mon Jun 15 18:24:38 2020 +0800
glib/glibmm/ustring.h: Fix building on Visual Studio 2015
Commit 8b8af81f accidentally changed the macro check from '_MSC_VER' to
'MSC_VER', fix that, so that things build correctly on Visual Studio 2015
glib/glibmm/ustring.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/glib/glibmm/ustring.h b/glib/glibmm/ustring.h
index c3e67209..6d7b736b 100644
--- a/glib/glibmm/ustring.h
+++ b/glib/glibmm/ustring.h
@@ -30,7 +30,7 @@
#endif
/* work around linker error on Visual Studio if we don't have GLIBMM_HAVE_ALLOWS_STATIC_INLINE_NPOS */
-#if defined(MSC_VER) && MSC_VER >= 1600 && !defined(GLIBMM_HAVE_ALLOWS_STATIC_INLINE_NPOS)
+#if defined(_MSC_VER) && _MSC_VER >= 1600 && !defined(GLIBMM_HAVE_ALLOWS_STATIC_INLINE_NPOS)
const std::basic_string<char>::size_type std::basic_string<char>::npos =
(std::basic_string<char>::size_type) -1;
#endif
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]