diff options
Diffstat (limited to 'automation/inc/automation/commtypes.hxx')
| -rw-r--r-- | automation/inc/automation/commtypes.hxx | 37 |
1 files changed, 6 insertions, 31 deletions
diff --git a/automation/inc/automation/commtypes.hxx b/automation/inc/automation/commtypes.hxx index cd6f7074fa15..8d7c976fb125 100644 --- a/automation/inc/automation/commtypes.hxx +++ b/automation/inc/automation/commtypes.hxx @@ -32,7 +32,7 @@ * This file is intended to supply the types and defines for Environment independent * building of the packethandler * Only adaption of this file should be necessary. Else it is a bug! - * Eather including apropriate files or defining the types when not available in the environment + * Ether including apropriate files or defining the types when not available in the environment * ************************************************************************/ @@ -53,46 +53,21 @@ #include <sal/types.h> typedef sal_Unicode comm_UniChar; - -// this is a trick to be sure the SO types are unknown, so the compiler will yell at us in case we use them -#ifndef _SOLAR_H -#define NO_SOLAR -#endif - -#ifdef NO_SOLAR -#define BYTE BYTE_hidden -#define BOOL BOOL_hidden -#define ULONG ULONG_hidden -#define USHORT USHORT_hidden -#define UINT16 UINT16_hidden -#define UINT32 UINT32_hidden - -#endif +#include "rtl/string.hxx" #include <tools/debug.hxx> #include <tools/solar.h> -typedef BYTE comm_BYTE; -typedef BOOL comm_BOOL; +typedef sal_uInt8 comm_BYTE; +typedef sal_Bool comm_BOOL; typedef sal_uInt32 comm_ULONG; typedef sal_uInt16 comm_USHORT; -typedef UINT16 comm_UINT16; -typedef UINT32 comm_UINT32; - -#ifdef NO_SOLAR -#undef BYTE -#undef BOOL -#undef ULONG -#undef USHORT -#undef UINT16 -#undef UINT32 - -#endif +typedef sal_uInt16 comm_UINT16; +typedef sal_uInt32 comm_UINT32; typedef sal_uInt16 comm_WORD; typedef sal_uInt32 comm_DWORD; -class SmartId; class String; #define comm_String String |