From 12f5facfa769a6b5554d950c8ca71a6aadaf9a78 Mon Sep 17 00:00:00 2001
From: Release Engineers <releng@openoffice.org>
Date: Fri, 10 Apr 2009 09:52:21 +0000
Subject: [PATCH] CWS-TOOLING: integrate CWS mingwport18 2009-03-27 12:51:41
 +0100 tono  r270150 : CWS-TOOLING: rebase CWS mingwport18 to trunk@270033
 (milestone: DEV300:m45) 2009-03-26 22:41:14 +0100 tono  r270120 : files with
 invalid names removed 2009-03-26 22:40:11 +0100 tono  r270119 : files with
 invalid names removed 2009-03-26 22:39:04 +0100 tono  r270118 : files with
 invalid names removed 2009-03-26 22:36:00 +0100 tono  r270117 : files with
 invalid names removed 2009-03-26 22:33:42 +0100 tono  r270116 : files with
 invalid names removed 2009-03-26 22:32:14 +0100 tono  r270115 : files with
 invalid names removed 2009-03-26 22:24:41 +0100 tono  r270114 : files with
 invalid names removed 2009-03-26 22:16:41 +0100 tono  r270113 : files with
 invalid names removed 2009-03-26 22:15:52 +0100 tono  r270112 : files with
 invalid names removed 2009-03-26 22:14:44 +0100 tono  r270111 : files with
 invalid names removed 2009-03-26 22:12:28 +0100 tono  r270110 : files with
 invalid names removed 2009-03-26 21:46:31 +0100 tono  r270109 : files with
 invalid names removed 2009-03-22 12:41:21 +0100 tono  r269847 : i#100463:
 MinGW port header patch enhancement 2009-03-22 12:39:39 +0100 tono  r269846 :
 i#100462: MinGW port update for python 2009-03-22 12:37:52 +0100 tono 
 r269845 : i#100461: MinGW port fix for store/workben 2009-03-22 12:36:10
 +0100 tono  r269844 : i#100460: MinGW port fix for sal when debug=true
 2009-03-21 01:06:50 +0100 tono  r269833 : i#100210: MinGW port fix for
 hunspell-1.2.8 2009-03-21 01:04:08 +0100 tono  r269832 : i#100209: MinGW port
 fix for sspi

---
 sal/osl/w32/file.cxx      | 6 +++---
 store/workben/makefile.mk | 8 ++++++++
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/sal/osl/w32/file.cxx b/sal/osl/w32/file.cxx
index b25ed7735d36..6e8eb570f84c 100644
--- a/sal/osl/w32/file.cxx
+++ b/sal/osl/w32/file.cxx
@@ -1460,7 +1460,7 @@ namespace /* private */
     void parse_UNC_path(const sal_Unicode* path, UNCComponents* puncc)
     {
         OSL_PRECOND(is_UNC_path(path), "Precondition violated: No UNC path");
-        OSL_PRECOND(!wcschr(path, SLASH), "Path must not contain slashes");
+        OSL_PRECOND(rtl_ustr_indexOfChar(path, SLASH) != -1, "Path must not contain slashes");
 
         const sal_Unicode* pend = path + rtl_ustr_getLength(path);
         const sal_Unicode* ppos = path + 2;
@@ -1580,7 +1580,7 @@ namespace /* private */
     e.g. 'c:\' or '\\Share' have no more parents */
     int path_make_parent(sal_Unicode* path)
     {
-        OSL_PRECOND(!wcschr(path, SLASH), "Path must not contain slashes");
+        OSL_PRECOND(rtl_ustr_indexOfChar(path, SLASH) != -1, "Path must not contain slashes");
         OSL_PRECOND(has_path_parent(path), "Path must have a parent");
 
         sal_Unicode* pos_last_backslash = path + rtl_ustr_lastIndexOfChar(path, BACKSLASH);
@@ -1833,7 +1833,7 @@ namespace /* private */
         oslDirectoryCreationCallbackFunc aDirectoryCreationCallbackFunc,
         void* pData)
     {
-        OSL_PRECOND(wcslen(dir_path) > 0 && (wcsrchr(dir_path, BACKSLASH) != (dir_path + (wcslen(dir_path) - 1))), \
+        OSL_PRECOND(rtl_ustr_getLength(dir_path) > 0 && (rtl_ustr_lastIndexOfChar(dir_path, BACKSLASH) != rtl_ustr_getLength(dir_path) - 1), \
         "Path must not end with a backslash");
 
         DWORD w32_error = create_dir_with_callback(
diff --git a/store/workben/makefile.mk b/store/workben/makefile.mk
index 636006eaea7b..334585710522 100644
--- a/store/workben/makefile.mk
+++ b/store/workben/makefile.mk
@@ -46,14 +46,22 @@ NO_DEFAULT_STL=TRUE
 .IF "$(GUI)" == "UNX"
 STORELIB=	-lstore
 .ELSE  # unx
+.IF "$(GUI)$(COM)"=="WNTGCC"
+STORELIB=	-lstore$(UDK_MAJOR)
+.ELSE
 STORELIB=	$(LB)$/istore.lib
+.ENDIF
 .ENDIF # unx
 .ENDIF # storelib
 
 .IF "$(GUI)" == "UNX"
 STOREDBGLIB=	$(LB)$/libstoredbg.a
 .ELSE  # unx
+.IF "$(GUI)$(COM)"=="WNTGCC"
+STOREDBGLIB=	$(LB)$/libstoredbg.a
+.ELSE
 STOREDBGLIB=	$(LB)$/storedbg.lib
+.ENDIF
 .ENDIF # unx
 
 CFLAGS+= -I..$/source