[Libreoffice-commits] .: 2 commits - curl/makefile.mk svl/inc svl/source

[Caolán McNamara]

 curl/makefile.mk                |    2 ++
 svl/inc/svl/svstdarr.hxx        |    5 -----
 svl/source/memtools/svarray.cxx |    2 --
 3 files changed, 2 insertions(+), 7 deletions(-)

New commits:
commit ae3a5e9c2d426ffed6d5fe53ebeb1113087903c4
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Oct 4 11:51:58 2011 +0100

    SvByteStrings can go now

diff --git a/svl/inc/svl/svstdarr.hxx b/svl/inc/svl/svstdarr.hxx
index 6968cc6..9df5b4b 100644
--- a/svl/inc/svl/svstdarr.hxx
+++ b/svl/inc/svl/svstdarr.hxx
@@ -83,11 +83,6 @@ SV_DECL_PTRARR_SORT_DEL_VISIBILITY( SvStringsISortDtor, StringPtr, 1, 1, SVL_DLL
 #define _SVSTDARR_STRINGSISORTDTOR_DECL
 #endif
 
-#ifndef _SVSTDARR_BYTESTRINGS_DECL
-SV_DECL_PTRARR_VISIBILITY( SvByteStrings, ByteStringPtr, 1, 1, SVL_DLLPUBLIC )
-#define _SVSTDARR_BYTESTRINGS_DECL
-#endif
-
 typedef std::deque< xub_StrLen > SvXub_StrLens;
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svl/source/memtools/svarray.cxx b/svl/source/memtools/svarray.cxx
index 88cc111..7024640 100644
--- a/svl/source/memtools/svarray.cxx
+++ b/svl/source/memtools/svarray.cxx
@@ -68,8 +68,6 @@ SV_IMPL_PTRARR( SvStringsDtor, StringPtr )
 SV_IMPL_OP_PTRARR_SORT( SvStringsSort, StringPtr )
 SV_IMPL_OP_PTRARR_SORT( SvStringsSortDtor, StringPtr )
 
-SV_IMPL_PTRARR( SvByteStrings, ByteStringPtr )
-
 // ---------------- strings -------------------------------------
 
 // Array mit anderer Seek-Methode!
commit 84dfaea69b40fe517b94ac4636b99fdd8c4bda4c
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Oct 4 11:51:16 2011 +0100

    no .pc when built without configure

diff --git a/curl/makefile.mk b/curl/makefile.mk
index 322c465..66b8d9b 100644
--- a/curl/makefile.mk
+++ b/curl/makefile.mk
@@ -159,7 +159,9 @@ OUT2INC= \
     include$/curl$/curlbuild.h		\
     include$/curl$/curlrules.h
 
+.IF "$(GUI)"=="UNX" || "$(COM)"=="GCC"
 OUT2INC+=libcurl.pc
+.ENDIF
 
 # --- Targets ------------------------------------------------------