diff options
| author | Damjan Jovanovic <damjan@apache.org> | 2018-09-05 02:48:29 +0000 |
|---|---|---|
| committer | Damjan Jovanovic <damjan@apache.org> | 2018-09-05 02:48:29 +0000 |
| commit | 1065d8ce5c66d901c0092f7a22b1f0bdd4c53526 (patch) | |
| tree | e96d1acac6961ac4b9396e2b1dec73f82f383b6c | |
| parent | 1a06b0a46509dca80846592d48841aff4bbfe6b8 (diff) | |
Further fixes to get Windows building.
Use native paths when calling idlc.
Don't export all symbols from salhelper's SimpleReferenceObject
on Windows, only those we have to, as some modules fail to link
otherwise.
There is no "date" component any more, it's been renamed.
Patch by: me
Notes
Notes:
ignore: obsolete
| -rw-r--r-- | postprocess/packcomponents/makefile.mk | 1 | ||||
| -rw-r--r-- | salhelper/inc/salhelper/simplereferenceobject.hxx | 16 | ||||
| -rw-r--r-- | solenv/gbuild/LinkTarget.mk | 2 |
3 files changed, 11 insertions, 8 deletions
diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk index 5b9efd1c7484..d99bd879a07a 100644 --- a/postprocess/packcomponents/makefile.mk +++ b/postprocess/packcomponents/makefile.mk @@ -147,7 +147,6 @@ my_components = \ component/xmloff/source/transform/xof \ component/xmloff/util/xo \ component/xmlscript/util/xcr \ - date \ dbase \ dbp \ dbpool2 \ diff --git a/salhelper/inc/salhelper/simplereferenceobject.hxx b/salhelper/inc/salhelper/simplereferenceobject.hxx index 9221e5462be5..b88591244e0e 100644 --- a/salhelper/inc/salhelper/simplereferenceobject.hxx +++ b/salhelper/inc/salhelper/simplereferenceobject.hxx @@ -70,7 +70,11 @@ namespace salhelper { as missing vector delete errors stopped linking. The small consolation is that is a private method, so it may as well not exist. Right? */ +#if defined _MSC_VER +class SimpleReferenceObject +#else class SALHELPER_DLLPUBLIC SimpleReferenceObject +#endif { public: inline SimpleReferenceObject() SAL_THROW(()): m_nCount(0) {} @@ -89,25 +93,25 @@ public: /** see general class documentation */ - static void * operator new(std::size_t nSize) SAL_THROW((std::bad_alloc)); + SALHELPER_DLLPUBLIC static void * operator new(std::size_t nSize) SAL_THROW((std::bad_alloc)); /** see general class documentation */ - static void * operator new(std::size_t nSize, + SALHELPER_DLLPUBLIC static void * operator new(std::size_t nSize, std::nothrow_t const & rNothrow) SAL_THROW(()); /** see general class documentation */ - static void operator delete(void * pPtr) SAL_THROW(()); + SALHELPER_DLLPUBLIC static void operator delete(void * pPtr) SAL_THROW(()); /** see general class documentation */ - static void operator delete(void * pPtr, std::nothrow_t const & rNothrow) + SALHELPER_DLLPUBLIC static void operator delete(void * pPtr, std::nothrow_t const & rNothrow) SAL_THROW(()); protected: - virtual ~SimpleReferenceObject() SAL_THROW(()); + SALHELPER_DLLPUBLIC virtual ~SimpleReferenceObject() SAL_THROW(()); private: oslInterlockedCount m_nCount; @@ -130,7 +134,7 @@ private: /** not implemented (see general class documentation) @internal */ - static void operator delete[](void * pPtr); + SALHELPER_DLLPUBLIC static void operator delete[](void * pPtr); }; } diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk index d71b4881e9ad..78c3f7f021c6 100644 --- a/solenv/gbuild/LinkTarget.mk +++ b/solenv/gbuild/LinkTarget.mk @@ -544,7 +544,7 @@ endif $(call gb_UnoPrivateApiTarget_get_target,$(1)/idl.cppumaker.flag): $(2) $(3) $(call gb_Output_announce,$@,$(true),PVTIDL,2) - -$$(call gb_Helper_abbreviate_dirs,\ + -$$(call gb_Helper_abbreviate_dirs_native,\ mkdir -p $$(call gb_UnoPrivateApiTarget_get_target,$(1)/urd) && \ mkdir -p $$(call gb_UnoPrivateApiTarget_get_target,$(1)/rdb) && \ mkdir -p $$(call gb_UnoPrivateApiTarget_get_target,$(1)/inc) && \ |