[Libreoffice-commits] core.git: configure.ac

Stephan Bergmann sbergman at redhat.com
Fri Feb 24 08:00:20 UTC 2017


 configure.ac |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 6502c53d5fd907fee82eb9ed58503c04739f339a
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri Feb 24 08:59:43 2017 +0100

    Oh, those are called Updates, not Service Packs
    
    Change-Id: If6cfe913445e8855eab3736d9abc63d7e152b361

diff --git a/configure.ac b/configure.ac
index 2882aec..e69e9f1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5519,14 +5519,14 @@ else
     fi
 fi
 
-dnl At least MSVC 2015 SP1 is known to sporadically emit warning C4592
+dnl At least MSVC 2015 Update 1 is known to sporadically emit warning C4592
 dnl ("implementation limitation" when defining OUStringLiteral variables in
-dnl vcl/source/app/IconThemeInfo.cxx), while SP3 is known good, and it is
+dnl vcl/source/app/IconThemeInfo.cxx), while Update 3 is known good, and it is
 dnl probably a good idea to require that anyway.  A reliable way to check for
-dnl MSVC 2015 SP3 appears to be to check for support of C++17 nested namespace
-dnl definitions (which requires /std:c++latest to be enabled):
+dnl MSVC 2015 Update 3 appears to be to check for support of C++17 nested
+dnl namespace definitions (which requires /std:c++latest to be enabled):
 if test "$COM" = MSC -a "$VCVER" = 140; then
-    AC_MSG_CHECKING([whether MSVC 2015 compiler $MSVC_CXX is at least SP3])
+    AC_MSG_CHECKING([whether MSVC 2015 compiler $MSVC_CXX is at least Update 3])
     save_CXX=$CXX
     save_CXXFLAGS=$CXXFLAGS
     CXX=$MSVC_CXX
@@ -5540,7 +5540,7 @@ if test "$COM" = MSC -a "$VCVER" = 140; then
     CXXFLAGS=$save_CXXFLAGS
     AC_MSG_RESULT([$good])
     if test "$good" = no; then
-        AC_MSG_ERROR([When using MSVC 2015, at least SP3 must be installed])
+        AC_MSG_ERROR([When using MSVC 2015, at least Update 3 must be installed])
     fi
 fi
 


More information about the Libreoffice-commits mailing list