Skip to content

C
core
Kaydet (Commit) 87d7ac74 authored tarafından Tor Lillqvist's avatar Tor Lillqvist
Dosyalara gözat
Seçenekler

Static linking for iOS effectively means "merged libs"

üst a75873de
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
sfx2/source/appl/appbas.cxx
Dosyayı görüntüle @ 87d7ac74
...@@ -85,7 +85,7 @@ ...@@ -85,7 +85,7 @@
#include <svl/srchitem.hxx> #include <svl/srchitem.hxx>
#include <osl/socket.hxx> #include <osl/socket.hxx>
#ifdef LIBO_MERGELIBS #if defined(LIBO_MERGELIBS) || defined(IOS)
/* Avoid clash with the ones from svx/source/form/typemap.cxx */ /* Avoid clash with the ones from svx/source/form/typemap.cxx */
#define aSfxBoolItem_Impl sfx2_source_appl_appbas_aSfxBoolItem_Impl #define aSfxBoolItem_Impl sfx2_source_appl_appbas_aSfxBoolItem_Impl
#define aSfxStringItem_Impl sfx2_source_appl_appbas_aSfxStringItem_Impl #define aSfxStringItem_Impl sfx2_source_appl_appbas_aSfxStringItem_Impl
...@@ -98,7 +98,7 @@ ...@@ -98,7 +98,7 @@
#define Selection #define Selection
#include "sfxslots.hxx" #include "sfxslots.hxx"
#ifdef LIBO_MERGELIBS #if defined(LIBO_MERGELIBS) || defined(IOS)
#undef aSfxBoolItem_Impl #undef aSfxBoolItem_Impl
#undef aSfxStringItem_Impl #undef aSfxStringItem_Impl
#undef aSfxUInt16Item_Impl #undef aSfxUInt16Item_Impl
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment