[Libreoffice-commits] core.git: Branch 'aoo/trunk' - sal/inc

[Damjan Jovanovic]

 sal/inc/osl/endian.h |    2 ++
 sal/inc/sal/types.h  |   15 ++++++++++++++-
 2 files changed, 16 insertions(+), 1 deletion(-)

New commits:
commit 9ab0a116fec8762da6ff31f2e103d5a2a7dae8ae
Author: Damjan Jovanovic <damjan at apache.org>
Date:   Mon Mar 5 17:31:41 2018 +0000

    Add some initial fixes for Win64 in main/sal.
    
    Patch by: me

diff --git a/sal/inc/osl/endian.h b/sal/inc/osl/endian.h
index b1a010922f58..3ea794f1a096 100644
--- a/sal/inc/osl/endian.h
+++ b/sal/inc/osl/endian.h
@@ -35,6 +35,8 @@ extern "C" {
 #ifdef _WIN32
 #   if defined(_M_IX86)
 #       define _LITTLE_ENDIAN
+#   elif defined(_M_AMD64)
+#       define _LITTLE_ENDIAN
 #   elif defined(_M_MRX000)
 #       define _LITTLE_ENDIAN
 #   elif defined(_M_ALPHA)
diff --git a/sal/inc/sal/types.h b/sal/inc/sal/types.h
index 1f4a0fedd077..7bf1685848ba 100644
--- a/sal/inc/sal/types.h
+++ b/sal/inc/sal/types.h
@@ -29,7 +29,7 @@
 /* Grab __SIZEOFxxx constants from typesconfig tool on Unix */
 #if defined UNX
   #include <sal/typesizes.h>
-#elif defined(WNT) || defined(OS2)
+#elif defined(WNT)
   /* FIXME: autogeneration of type sizes on Win32/Win64? */
   #define SAL_TYPES_ALIGNMENT2      1
   #define SAL_TYPES_ALIGNMENT4      1
@@ -38,6 +38,19 @@
   #define SAL_TYPES_SIZEOFINT       4
   #define SAL_TYPES_SIZEOFLONG      4
   #define SAL_TYPES_SIZEOFLONGLONG      8
+  #if defined(_M_IX86)
+    #define SAL_TYPES_SIZEOFPOINTER     4
+  #elif defined(_M_AMD64)
+    #define SAL_TYPES_SIZEOFPOINTER     8
+  #endif
+#elif defined(OS2)
+  #define SAL_TYPES_ALIGNMENT2      1
+  #define SAL_TYPES_ALIGNMENT4      1
+  #define SAL_TYPES_ALIGNMENT8      1
+  #define SAL_TYPES_SIZEOFSHORT     2
+  #define SAL_TYPES_SIZEOFINT       4
+  #define SAL_TYPES_SIZEOFLONG      4
+  #define SAL_TYPES_SIZEOFLONGLONG      8
   #define SAL_TYPES_SIZEOFPOINTER       4
 #endif