diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2013-12-16 16:45:46 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2013-12-16 21:43:12 +0100 |
| commit | a83b2af9abddfb2a6a127049374269b53241c183 (patch) | |
| tree | e6c445919c33d0ef9ec5600563961be1e076a6ca /include/uno | |
| parent | 698158655a9e2e74acc065899e668d365c2b4195 (diff) | |
Clean-up uno/lbnames.h
Change-Id: I4bd729499aa8be58f04194656e35c1f79d5d4919
Diffstat (limited to 'include/uno')
| -rw-r--r-- | include/uno/current_context.hxx | 1 | ||||
| -rw-r--r-- | include/uno/environment.hxx | 2 | ||||
| -rw-r--r-- | include/uno/lbnames.h | 9 | ||||
| -rw-r--r-- | include/uno/mapping.hxx | 1 |
4 files changed, 8 insertions, 5 deletions
diff --git a/include/uno/current_context.hxx b/include/uno/current_context.hxx index 3019006e4e33..e75f41fb3fe6 100644 --- a/include/uno/current_context.hxx +++ b/include/uno/current_context.hxx @@ -20,6 +20,7 @@ #define INCLUDED_UNO_CURRENT_CONTEXT_HXX #include <uno/current_context.h> +#include <uno/lbnames.h> #include <com/sun/star/uno/XCurrentContext.hpp> diff --git a/include/uno/environment.hxx b/include/uno/environment.hxx index cd5db7a672b4..0f4d15bdf66d 100644 --- a/include/uno/environment.hxx +++ b/include/uno/environment.hxx @@ -55,7 +55,7 @@ public: respectively to current C++ Environment. @since UDK 3.2.7 */ - inline static Environment getCurrent(rtl::OUString const & typeName = rtl::OUString(CPPU_STRINGIFY(CPPU_ENV))) SAL_THROW(()); + inline static Environment getCurrent(rtl::OUString const & typeName = rtl::OUString(CPPU_CURRENT_LANGUAGE_BINDING_NAME)) SAL_THROW(()); /// @cond INTERNAL // these are here to force memory de/allocation to sal lib. diff --git a/include/uno/lbnames.h b/include/uno/lbnames.h index bc2afa6cccbd..83a4608925b1 100644 --- a/include/uno/lbnames.h +++ b/include/uno/lbnames.h @@ -21,15 +21,16 @@ /* I assume "LB" means "Language Binding" */ +#include <sal/config.h> + +#include <sal/macros.h> + #ifdef __cplusplus #ifdef CPPU_ENV -#define CPPU_STRINGIFY_EX( x ) #x -#define CPPU_STRINGIFY( x ) CPPU_STRINGIFY_EX( x ) - /** Name for C++ compiler/ platform, e.g. "gcc3", "msci" */ -#define CPPU_CURRENT_LANGUAGE_BINDING_NAME CPPU_STRINGIFY( CPPU_ENV ) +#define CPPU_CURRENT_LANGUAGE_BINDING_NAME SAL_STRINGIFY( CPPU_ENV ) #else diff --git a/include/uno/mapping.hxx b/include/uno/mapping.hxx index 5f96972433b7..f8828170b955 100644 --- a/include/uno/mapping.hxx +++ b/include/uno/mapping.hxx @@ -27,6 +27,7 @@ #include <com/sun/star/uno/Reference.hxx> #include <cppu/unotype.hxx> #include <uno/environment.hxx> +#include <uno/lbnames.h> typedef struct _typelib_TypeDescription typelib_TypeDescription; typedef struct _typelib_InterfaceTypeDescription typelib_InterfaceTypeDescription; |