diff options
author | Tor Lillqvist <tml@iki.fi> | 2013-09-03 16:50:50 +0300 |
---|---|---|
committer | Tor Lillqvist <tml@iki.fi> | 2013-09-03 17:38:53 +0300 |
commit | d81da41c9d121f5ec452545b686a71c51a117eed (patch) | |
tree | 33e3eb3987f0c0848012e570ec783667d3a02816 /sal/osl/unx | |
parent | dd3293b83aa7bdb5688005d3906a0de536631487 (diff) |
Don't compile all of the sal library as Objective-C++ on OS X after all
I doubt it affects ABI, but let's not take the risk.
Instead, just compile the uunxapi.cxx file (which has no public API)
as Objective-C++, as that is now the only one where Objective-C API is
used.
This reverts part of d22c94dbf16d18bce39f060aa21f3083169426ca
Change-Id: I240dbb36529c419b81b062f6fe860a9e621c2400
Diffstat (limited to 'sal/osl/unx')
-rw-r--r-- | sal/osl/unx/file.cxx | 2 | ||||
-rw-r--r-- | sal/osl/unx/uunxapi.cxx | 2 | ||||
-rw-r--r-- | sal/osl/unx/uunxapi.mm | 1 |
3 files changed, 3 insertions, 2 deletions
diff --git a/sal/osl/unx/file.cxx b/sal/osl/unx/file.cxx index 4ae6ef641ba0..571a79c82998 100644 --- a/sal/osl/unx/file.cxx +++ b/sal/osl/unx/file.cxx @@ -1,4 +1,4 @@ -/* -*- Mode: ObjC; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /* * This file is part of the LibreOffice project. * diff --git a/sal/osl/unx/uunxapi.cxx b/sal/osl/unx/uunxapi.cxx index 316f75a3bae1..d4116456b083 100644 --- a/sal/osl/unx/uunxapi.cxx +++ b/sal/osl/unx/uunxapi.cxx @@ -1,4 +1,4 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* -*- Mode: ObjC; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /* * This file is part of the LibreOffice project. * diff --git a/sal/osl/unx/uunxapi.mm b/sal/osl/unx/uunxapi.mm new file mode 100644 index 000000000000..5a7e17f34491 --- /dev/null +++ b/sal/osl/unx/uunxapi.mm @@ -0,0 +1 @@ +#include "uunxapi.cxx" |