openoffice-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dam...@apache.org
Subject svn commit: r1840081 - in /openoffice/trunk/main: postprocess/packcomponents/makefile.mk salhelper/inc/salhelper/simplereferenceobject.hxx solenv/gbuild/LinkTarget.mk
Date Wed, 05 Sep 2018 02:48:29 GMT
Author: damjan
Date: Wed Sep  5 02:48:29 2018
New Revision: 1840081

URL: http://svn.apache.org/viewvc?rev=1840081&view=rev
Log:
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


Modified:
    openoffice/trunk/main/postprocess/packcomponents/makefile.mk
    openoffice/trunk/main/salhelper/inc/salhelper/simplereferenceobject.hxx
    openoffice/trunk/main/solenv/gbuild/LinkTarget.mk

Modified: openoffice/trunk/main/postprocess/packcomponents/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/postprocess/packcomponents/makefile.mk?rev=1840081&r1=1840080&r2=1840081&view=diff
==============================================================================
--- openoffice/trunk/main/postprocess/packcomponents/makefile.mk (original)
+++ openoffice/trunk/main/postprocess/packcomponents/makefile.mk Wed Sep  5 02:48:29 2018
@@ -147,7 +147,6 @@ my_components = \
     component/xmloff/source/transform/xof \
     component/xmloff/util/xo \
     component/xmlscript/util/xcr \
-    date \
     dbase \
     dbp \
     dbpool2 \

Modified: openoffice/trunk/main/salhelper/inc/salhelper/simplereferenceobject.hxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/salhelper/inc/salhelper/simplereferenceobject.hxx?rev=1840081&r1=1840080&r2=1840081&view=diff
==============================================================================
--- openoffice/trunk/main/salhelper/inc/salhelper/simplereferenceobject.hxx (original)
+++ openoffice/trunk/main/salhelper/inc/salhelper/simplereferenceobject.hxx Wed Sep  5 02:48:29
2018
@@ -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);
 };
 
 }

Modified: openoffice/trunk/main/solenv/gbuild/LinkTarget.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/gbuild/LinkTarget.mk?rev=1840081&r1=1840080&r2=1840081&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/gbuild/LinkTarget.mk (original)
+++ openoffice/trunk/main/solenv/gbuild/LinkTarget.mk Wed Sep  5 02:48:29 2018
@@ -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) && \



Mime
View raw message