summaryrefslogtreecommitdiff
path: root/sal
diff options
context:
space:
mode:
authorKurt Zenker <kz@openoffice.org>2004-06-11 10:56:30 +0000
committerKurt Zenker <kz@openoffice.org>2004-06-11 10:56:30 +0000
commit08409ab27f8af6b31bc54fe4a88484b7c15a8bd7 (patch)
tree5a9a89daa2c68f8fc465d0c082b3c7ea11374108 /sal
parent7d9c1145ee2b201be04100530dce292b5d48349e (diff)
INTEGRATION: CWS unopkg2 (1.2.280); FILE MERGED
2004/05/21 09:08:29 dbo 1.2.280.2: #i20304# 2004/05/19 12:07:05 dbo 1.2.280.1: #i20304# added _OS, _ARCH
Diffstat (limited to 'sal')
-rw-r--r--sal/rtl/source/macro.hxx43
1 files changed, 41 insertions, 2 deletions
diff --git a/sal/rtl/source/macro.hxx b/sal/rtl/source/macro.hxx
index feac06036565..30ab48ccb5a5 100644
--- a/sal/rtl/source/macro.hxx
+++ b/sal/rtl/source/macro.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: macro.hxx,v $
*
- * $Revision: 1.2 $
+ * $Revision: 1.3 $
*
- * last change: $Author: kr $ $Date: 2001-08-30 11:51:36 $
+ * last change: $Author: kz $ $Date: 2004-06-11 11:56:30 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -65,6 +65,45 @@
#include <rtl/bootstrap.h>
#include <rtl/ustring.hxx>
+#if defined WIN32
+#define THIS_OS "Windows"
+#elif defined SOLARIS
+#define THIS_OS "Solaris"
+#elif defined LINUX
+#define THIS_OS "Linux"
+#elif defined MACOSX
+#define THIS_OS "MacOSX"
+#elif defined NETBSD
+#define THIS_OS "NetBSD"
+#elif defined FREEBSD
+#define THIS_OS "FreeBSD"
+#elif defined IRIX
+#define THIS_OS "Irix"
+#endif
+
+#if ! defined THIS_OS
+#error "unknown OS -- insert your OS identifier above"
+this is inserted for the case that the preprocessor ignores error
+#endif
+
+#if defined INTEL
+#define THIS_ARCH "x86"
+#elif defined POWERPC
+#define THIS_ARCH "PowerPC"
+#elif defined S390
+#define THIS_ARCH "S390"
+#elif defined SPARC
+#define THIS_ARCH "SPARC"
+#elif defined IRIX
+#define THIS_ARCH "MIPS"
+#endif
+
+#if ! defined THIS_ARCH
+#error "unknown ARCH -- insert your ARCH identifier above"
+this is inserted for the case that the preprocessor ignores error
+#endif
+
+
/*
Expand macros via rtl_bootstrap_get.
see