You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by da...@apache.org on 2018/03/05 17:31:42 UTC
svn commit: r1825923 - in /openoffice/trunk/main/sal/inc: osl/endian.h
sal/types.h
Author: damjan
Date: Mon Mar 5 17:31:41 2018
New Revision: 1825923
URL: http://svn.apache.org/viewvc?rev=1825923&view=rev
Log:
Add some initial fixes for Win64 in main/sal.
Patch by: me
Modified:
openoffice/trunk/main/sal/inc/osl/endian.h
openoffice/trunk/main/sal/inc/sal/types.h
Modified: openoffice/trunk/main/sal/inc/osl/endian.h
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sal/inc/osl/endian.h?rev=1825923&r1=1825922&r2=1825923&view=diff
==============================================================================
--- openoffice/trunk/main/sal/inc/osl/endian.h (original)
+++ openoffice/trunk/main/sal/inc/osl/endian.h Mon Mar 5 17:31:41 2018
@@ -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)
Modified: openoffice/trunk/main/sal/inc/sal/types.h
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sal/inc/sal/types.h?rev=1825923&r1=1825922&r2=1825923&view=diff
==============================================================================
--- openoffice/trunk/main/sal/inc/sal/types.h (original)
+++ openoffice/trunk/main/sal/inc/sal/types.h Mon Mar 5 17:31:41 2018
@@ -29,11 +29,24 @@
/* 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
#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
+ #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