[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - desktop/source

[Stephan Bergmann]

 desktop/source/deployment/misc/dp_platform.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 6d142e8f0a3dfb609ccaf9dd8905a16ed5525c36
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Mar 27 14:13:45 2018 +0200

    Fix typo ("x86_64" -> "X86_64")
    
    ...introduced with 2d2294fb82bd4f0d1d805405631aeb1acbc36cbb "Add x64 Windows
    here, too".  As reported by Richard Webb at
    <https://lists.freedesktop.org/archives/libreoffice/2018-March/079870.html>
    "Re: Manifest.xml for 64bit LO".
    
    Change-Id: I1681908012e73e520bebd79b8149788358ea49a3
    Reviewed-on: https://gerrit.libreoffice.org/51946
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>
    (cherry picked from commit 045e2755163042c3c0bc83595b1c73104cb76721)
    Reviewed-on: https://gerrit.libreoffice.org/51950
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/desktop/source/deployment/misc/dp_platform.cxx b/desktop/source/deployment/misc/dp_platform.cxx
index f888c6da4a52..74d80e9f1e9e 100644
--- a/desktop/source/deployment/misc/dp_platform.cxx
+++ b/desktop/source/deployment/misc/dp_platform.cxx
@@ -77,7 +77,7 @@ namespace
         else if (token == "windows_x86")
             ret = checkOSandCPU("Windows", "x86");
         else if (token == "windows_x86_64")
-            ret = checkOSandCPU("Windows", "x86_64");
+            ret = checkOSandCPU("Windows", "X86_64");
         else if (token == "solaris_sparc")
             ret = checkOSandCPU("Solaris", "SPARC");
         else if (token == "solaris_sparc64")