[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.1' - desktop/source

[Stephan Bergmann]

 desktop/source/deployment/misc/dp_platform.cxx |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit da7a96fdedf7927202450b277ff4d44e7090729a
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri Aug 30 19:18:26 2013 +0200

    Add macosx_x86_64 extension platform identifier
    
    Change-Id: Ie7b6e8dee54ae240ff1ca7e7cac89b914dcce9ff

diff --git a/desktop/source/deployment/misc/dp_platform.cxx b/desktop/source/deployment/misc/dp_platform.cxx
index de8ea66..830f865 100644
--- a/desktop/source/deployment/misc/dp_platform.cxx
+++ b/desktop/source/deployment/misc/dp_platform.cxx
@@ -56,6 +56,7 @@
 #define PLATFORM_NETBSD_X86         "netbsd_x86"
 #define PLATFORM_NETBSD_X86_64      "netbsd_x86_64"
 #define PLATFORM_MACOSX_X86         "macosx_x86"
+#define PLATFORM_MACOSX_X86_64      "macosx_x86_64"
 #define PLATFORM_OPENBSD_X86        "openbsd_x86"
 #define PLATFORM_OPENBSD_X86_64     "openbsd_x86_64"
 #define PLATFORM_DRAGONFLY_X86      "dragonfly_x86"
@@ -164,6 +165,8 @@ namespace
             ret = checkOSandCPU("NetBSD", "X86_64");
         else if (token == PLATFORM_MACOSX_X86)
             ret = checkOSandCPU("MacOSX", "x86");
+        else if (token == PLATFORM_MACOSX_X86_64)
+            ret = checkOSandCPU("MacOSX", "X86_64");
         else if (token == PLATFORM_AIX_POWERPC)
             ret = checkOSandCPU("AIX", "PowerPC");
         else if (token == PLATFORM_OPENBSD_X86)