diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-02-27 14:46:03 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-02-27 17:09:44 +0100 |
| commit | 166a79df88853847528d558ea98656ad358f4645 (patch) | |
| tree | 7d2a7ea0499a89462ff5a7731bafdeee6b277e51 /sal | |
| parent | 8b8cd431c5c3ee03974299337ecdd25e0593210a (diff) | |
sal: use typesizes.h in MSVC build too
The types.h header defined the alignments to be 1 for MSVC, while
configure set them to 2/4/8. It appears the alignment are only used in
very few implementation details, so nothing should break by changing the
values.
Change-Id: I56ce85e0607159f0a4f653dd03480533b0adba07
Diffstat (limited to 'sal')
| -rw-r--r-- | sal/ZipPackage_sal_generated.mk | 2 | ||||
| -rw-r--r-- | sal/inc/sal/types.h | 18 |
2 files changed, 1 insertions, 19 deletions
diff --git a/sal/ZipPackage_sal_generated.mk b/sal/ZipPackage_sal_generated.mk index dd9af97e6b84..9d013e304414 100644 --- a/sal/ZipPackage_sal_generated.mk +++ b/sal/ZipPackage_sal_generated.mk @@ -29,8 +29,6 @@ $(eval $(call gb_ZipPackage_ZipPackage,sal_generated,$(call gb_CustomTarget_get_ $(eval $(call gb_ZipPackage_add_files,sal_generated,inc/sal,include/sal,sal/udkversion.h)) -ifneq ($(COM),MSC) $(eval $(call gb_ZipPackage_add_files,sal_generated,inc/sal,include/sal,sal/typesizes.h)) -endif # vim: set noet sw=4 ts=4: diff --git a/sal/inc/sal/types.h b/sal/inc/sal/types.h index 117de03b4df9..fa72798dd5f1 100644 --- a/sal/inc/sal/types.h +++ b/sal/inc/sal/types.h @@ -27,23 +27,7 @@ #include <config_global.h> #endif -#if defined UNX - #include <sal/typesizes.h> -#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 - #ifdef _WIN64 - #define SAL_TYPES_SIZEOFPOINTER 8 - #else - #define SAL_TYPES_SIZEOFPOINTER 4 - #endif -#endif +#include <sal/typesizes.h> #ifdef __cplusplus extern "C" { |