Commits

Anonymous committed d957dd8 Merge

sb140: merged in cws/mingwport34

Comments (0)

Files changed (6)

RepositoryFixes.mk

 gb_Library_FILENAMES := $(patsubst vbahelper:ivbahelper%,vbahelper:vbahelper%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst vos3:ivos3%,vos3:ivos%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst xml2:ixml2%,xml2:libxml2$(gb_Library_IARCEXT),$(gb_Library_FILENAMES))
-gb_Library_FILENAMES := $(patsubst xslt:ixslt%,xslt:libxslt$(gb_Library_IARCEXT),$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst xslt:ixslt%,xslt:libxslt.dll$(gb_Library_IARCEXT),$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst rdf:irdf%,rdf:librdf.dll$(gb_Library_IARCEXT),$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst z:iz%,z:zlib%,$(gb_Library_FILENAMES))
 ifeq ($(gb_PRODUCT),$(true))
 gb_Library_DLLFILENAMES += $(foreach lib,$(gb_Library_ILIBFILENAMES),$(lib):$(PSDK_HOME)/lib/$(lib)$(gb_Library_ILIBEXT))
 
 gb_Library_DLLFILENAMES := $(patsubst comphelper:comphelper%,comphelper:comphelp%,$(gb_Library_DLLFILENAMES))
-gb_Library_DLLFILENAMES := $(patsubst cppunit:cppunit%,cppunit:cygcppunit-1-12-1%,$(gb_Library_DLLFILENAMES))
 gb_Library_DLLFILENAMES := $(patsubst icuuc:icuuc%,icuuc:icuuc40%,$(gb_Library_DLLFILENAMES))
 gb_Library_DLLFILENAMES := $(patsubst ucbhelper:ucbhelper%,ucbhelper:ucbhelper4%,$(gb_Library_DLLFILENAMES))
 gb_Library_DLLFILENAMES := $(patsubst z:z%,z:zlib%,$(gb_Library_DLLFILENAMES))
 BUILD_DIR=$(CONFIGURE_DIR)$/lib
 BUILD_ACTION=make
 OUT2BIN=$(BUILD_DIR)$/.libs$/libcurl*.dll
-OUT2LIB=$(BUILD_DIR)$/.libs$/libcurl*.a
+OUT2LIB=$(BUILD_DIR)$/.libs$/libcurl*.dll.a
 .ELSE
 # make use of stlport headerfiles
 EXT_USE_STLPORT=TRUE

l10ntools/source/help/HelpCompiler.hxx

         {
             ::rtl::OUString ustrSystemPath;
             osl::File::getSystemPathFromFileURL(data, ustrSystemPath);
-            return ustrSystemPath.getStr();
+            return reinterpret_cast< wchar_t const * >(ustrSystemPath.getStr());
         }
 #endif
         std::string native_directory_string() const { return native_file_string(); }

sal/osl/w32/module.cxx

     //on Windows XP and ERROR_INSUFFICIENT_BUFFER on Windows 7 (64bit)
 	if (hInstance == NULL && Module->length > 260)
 	{
-        std::vector<sal_Unicode, rtl::Allocator<sal_Unicode> > vec(Module->length + 1);
+        std::vector<WCHAR, rtl::Allocator<WCHAR> > vec(Module->length + 1);
 		DWORD len = GetShortPathNameW(reinterpret_cast<LPCWSTR>(Module->buffer), 
                                       &vec[0], Module->length + 1);
 		if (len )

sal/osl/w32/procimpl.cxx

             std::vector<sal_Unicode, rtl::Allocator<sal_Unicode> > vec(path.getLength() + 1);
             //GetShortPathNameW only works if the file can be found!
             const DWORD len = GetShortPathNameW(
-                path.getStr(), &vec[0], path.getLength() + 1);
+                reinterpret_cast<LPCWSTR>(path.getStr()), reinterpret_cast<LPWSTR>(&vec[0]), path.getLength() + 1);
 
             if (!len && GetLastError() == ERROR_FILE_NOT_FOUND
                 && extension.getLength())
                 std::vector<sal_Unicode, rtl::Allocator<sal_Unicode> > vec2(
                     extPath.getLength() + 1);
                 const DWORD len2 = GetShortPathNameW(
-                    extPath.getStr(), &vec2[0], extPath.getLength() + 1);
+                    reinterpret_cast<LPCWSTR>(extPath.getStr()), reinterpret_cast<LPWSTR>(&vec2[0]), extPath.getLength() + 1);
                 ret = rtl::OUString(&vec2[0], len2);
             }
             else

solenv/inc/libs.mk

 .ELSE			# "$(GUI)$(COM)"=="WNTGCC"
 JVMACCESSLIB = -ljvmaccess$(COMID)
 .ENDIF			# "$(GUI)$(COM)"=="WNTGCC"
-.IF "$(OS)" == "WNT"
-CPPUNITLIB = -lcygcppunit-1-12-1
-.ELSE
 .IF "$(SYSTEM_CPPUNIT)"=="YES"
 CPPUNITLIB = $(CPPUNIT_LIBS)
 .ELSE
 CPPUNITLIB = -lcppunit
 .ENDIF
-.ENDIF
 .IF "$(SYSTEM_LIBXSLT)"=="YES"
 XSLTLIB=$(LIBXSLT_LIBS)
 .ELSE