diff options
| author | Tor Lillqvist <tml@iki.fi> | 2013-03-23 19:06:58 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2013-03-26 18:45:04 +0200 |
| commit | 5a5c8e253abbef5626dab70f8978275ac3c742f8 (patch) | |
| tree | 86c65cdfbff8ea0140937dee1311f65619f9aaf7 /vcl | |
| parent | Lock files make no sense on Android or iOS (diff) | |
| download | core-5a5c8e253abbef5626dab70f8978275ac3c742f8.tar.gz core-5a5c8e253abbef5626dab70f8978275ac3c742f8.zip | |
Check feature test macros instead of ANDROID and/or IOS
Pass -DLIBO_FEATURE_FOO to compiler for some elements in BUILD_TYPE.
BUILD_TYPE has at least two kinds of elements: Those that indicate
building a bundled copy of some 3rd-party library, and those that
indicate some specific feature of the LibreOffice platform or
build-time configuration choice. This is for the latter kind.
Change many of the checks for Android and/or iOS in the source code to
check LIBO_FEATURE_DESKTOP, LIBO_FEATURE_HELP or DISABLE_EXTENSIONS
instead, in cases where that is what is meant, not Android or iOS
specifically.
Change-Id: I2cd3f3bb99e953c7754dcea76a426f8f9d61e4db
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/app/dbggui.cxx | 2 | ||||
| -rw-r--r-- | vcl/source/window/window.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/vcl/source/app/dbggui.cxx b/vcl/source/app/dbggui.cxx index 0161df6dfa08..8296e58387f1 100644 --- a/vcl/source/app/dbggui.cxx +++ b/vcl/source/app/dbggui.cxx @@ -1661,7 +1661,7 @@ void DbgPrintMsgBox( const char* pLine ) } strcpy( aDbgOutBuf, pLine ); -#if defined UNX && !(defined ANDROID || defined IOS) +#if defined UNX && defined LIBO_FEATURE_DESKTOP strcat( aDbgOutBuf, "\nAbort ? (Yes=abort / No=ignore / Cancel=core dump)" ); #elif defined _WIN32 strcat( aDbgOutBuf, "\nAbort ? (Yes=abort / No=ignore / Cancel=try to invoke debugger)" ); diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx index 1a478e6ba2de..459b9176f5fa 100644 --- a/vcl/source/window/window.cxx +++ b/vcl/source/window/window.cxx @@ -8325,7 +8325,7 @@ uno::Reference< XDragSource > Window::GetDragSource() { DBG_CHKTHIS( Window, ImplDbgCheckWindow ); -#if !defined(ANDROID) && !defined(IOS) +#ifdef LIBO_FEATURE_DESKTOP if( mpWindowImpl->mpFrameData ) { |