[Libreoffice-commits] core.git: include/tools

Noel (via logerrit) logerrit at kemper.freedesktop.org
Mon Nov 16 13:32:24 UTC 2020


 include/tools/long.hxx |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 7599f8743b56b8858cb0e50cf3f590d17891c041
Author:     Noel <noelgrandin at gmail.com>
AuthorDate: Wed Nov 11 14:01:11 2020 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Mon Nov 16 14:31:35 2020 +0100

    make the tools::Long define logic more obvious
    
    - in tools/long.hxx, use _WIN64 to indicate that we are
      doing this for the benefit of Windows 64-bit
    
    Change-Id: I5eec88be96a7622ba90bd9582406f70c89e8c28d
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105584
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/include/tools/long.hxx b/include/tools/long.hxx
index ceda30676913..ef707070af8b 100644
--- a/include/tools/long.hxx
+++ b/include/tools/long.hxx
@@ -23,12 +23,12 @@
  */
 namespace tools
 {
-#if SAL_TYPES_SIZEOFPOINTER == 8
+#if defined _WIN64
 typedef sal_Int64 Long;
 typedef sal_uInt64 ULong;
 #else
-typedef sal_Int32 Long;
-typedef sal_uInt32 ULong;
+typedef long Long;
+typedef unsigned long ULong;
 #endif
 }
 


More information about the Libreoffice-commits mailing list