diff options
author | mb93783 <mb93783@v60x-so15.Germany.Sun.COM> | 2009-12-02 12:43:33 +0100 |
---|---|---|
committer | mb93783 <mb93783@v60x-so15.Germany.Sun.COM> | 2009-12-02 12:43:33 +0100 |
commit | c4bc00d649859bbde1bf1c98c4939e43796dd471 (patch) | |
tree | 9e84802b12d7f2fbc95b699fb0afa1af6dab9611 /sal | |
parent | 699ebff65d9c383530c2929f3c7c10e68aabbf9a (diff) | |
parent | 8fd3f31eb907c32d01f16e5d87ed0ed203db8e6e (diff) |
merge to m66
Diffstat (limited to 'sal')
-rw-r--r-- | sal/rtl/source/macro.hxx | 2 | ||||
-rw-r--r-- | sal/typesconfig/typesconfig.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/sal/rtl/source/macro.hxx b/sal/rtl/source/macro.hxx index a007d9e1cdab..2f0b723d236a 100644 --- a/sal/rtl/source/macro.hxx +++ b/sal/rtl/source/macro.hxx @@ -94,6 +94,8 @@ this is inserted for the case that the preprocessor ignores error # define THIS_ARCH "IA64" #elif defined M68K # define THIS_ARCH "M68K" +#elif defined HPPA +# define THIS_ARCH "HPPA" #endif #if ! defined THIS_ARCH diff --git a/sal/typesconfig/typesconfig.c b/sal/typesconfig/typesconfig.c index 932d80fd979a..c9d6ede62cb7 100644 --- a/sal/typesconfig/typesconfig.c +++ b/sal/typesconfig/typesconfig.c @@ -163,7 +163,7 @@ int check( TestFunc func, Type eT, void* p ) |* Letzte Aenderung |* *************************************************************************/ -#if defined(IA64) || defined(ARM32) +#if defined(IA64) || defined(ARM32) || defined(HPPA) int forceerror() { |