From 4cd7a9b5d6262abdacf92e61793620a4eadf84f5 Mon Sep 17 00:00:00 2001 From: Vladimir Glazounov Date: Tue, 20 Jan 2009 16:36:21 +0000 Subject: CWS-TOOLING: integrate CWS mingwport16 2009-01-15 13:11:20 +0100 releng r266363 : tidy-up tabs 2008-11-28 15:33:23 +0100 tono r264557 : i95203: mingw build without stlport 2008-11-22 07:19:50 +0100 tono r264180 : i96436: make mingw bridge conform with reg-struct-return 2008-11-22 05:14:58 +0100 tono r264179 : i96436: make mingw bridge conform with reg-struct-return 2008-11-21 17:09:04 +0100 tono r264153 : i95203: mingw build without stlport 2008-11-21 16:59:55 +0100 tono r264152 : i96436: make mingw bridge conform with reg-struct-return 2008-11-21 16:59:18 +0100 tono r264151 : i96436: make mingw bridge conform with reg-struct-return 2008-11-21 16:57:01 +0100 tono r264150 : i96436: make mingw bridge conform with reg-struct-return 2008-11-21 16:53:19 +0100 tono r264149 : i96100: mingw port for icu 4.0 2008-11-13 13:41:13 +0100 tono r263643 : i95203: mingw: Build without stlport 2008-11-13 13:29:38 +0100 tono r263640 : i96100: MinGW port for icu 4.0 2008-11-13 13:17:10 +0100 tono r263634 : i96098: MinGW port fix for new Windows API 2008-11-09 15:22:59 +0100 tono r263497 : i95198: mingwport do not interfere with Cygwin 2008-11-09 14:44:54 +0100 tono r263496 : i95190: mingwport avoid use of MS assembler 2008-11-09 14:32:26 +0100 tono r263495 : i95190: mingwport trivial build fixes --- shell/inc/internal/thumbviewer.hxx | 5 +++++ shell/source/win32/shlxthandler/classfactory.cxx | 5 +++++ .../source/win32/shlxthandler/ooofilt/ooofilt.cxx | 4 ++++ .../win32/shlxthandler/util/iso8601_converter.cxx | 24 +++++++++++++++++++--- shell/source/win32/simplemail/senddoc.cxx | 1 + 5 files changed, 36 insertions(+), 3 deletions(-) (limited to 'shell') diff --git a/shell/inc/internal/thumbviewer.hxx b/shell/inc/internal/thumbviewer.hxx index 7fa9fcbf142e..174048ff0cca 100644 --- a/shell/inc/internal/thumbviewer.hxx +++ b/shell/inc/internal/thumbviewer.hxx @@ -37,6 +37,11 @@ #endif #include #include +#ifdef __MINGW32__ +#include +using std::min; +using std::max; +#endif #include #if defined _MSC_VER #pragma warning(pop) diff --git a/shell/source/win32/shlxthandler/classfactory.cxx b/shell/source/win32/shlxthandler/classfactory.cxx index db15032fc9a5..ee60cb4f62b7 100644 --- a/shell/source/win32/shlxthandler/classfactory.cxx +++ b/shell/source/win32/shlxthandler/classfactory.cxx @@ -35,6 +35,11 @@ #include "internal/infotips.hxx" #include "internal/propsheets.hxx" #include "internal/columninfo.hxx" +#ifdef __MINGW32__ +#include +using ::std::max; +using ::std::min; +#endif #include "internal/thumbviewer.hxx" #include "internal/shlxthdl.hxx" diff --git a/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx b/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx index a8d4a5fb2b3a..e22fb89f94cf 100644 --- a/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx +++ b/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx @@ -79,6 +79,10 @@ #include "assert.h" #include "ooofilt.hxx" #include "propspec.hxx" +#ifdef __MINGW32__ +#include +using ::std::min; +#endif //C------------------------------------------------------------------------- diff --git a/shell/source/win32/shlxthandler/util/iso8601_converter.cxx b/shell/source/win32/shlxthandler/util/iso8601_converter.cxx index 8d46b0bd131b..ff7fe963413f 100644 --- a/shell/source/win32/shlxthandler/util/iso8601_converter.cxx +++ b/shell/source/win32/shlxthandler/util/iso8601_converter.cxx @@ -149,17 +149,35 @@ std::wstring iso8601_duration_to_local_duration(const std::wstring& iso8601durat hours = buff; } - std::wostringstream oss; - #if defined(_MSC_VER) && defined(_M_X64) + std::wostringstream oss; oss << std::setw(2) << std::setfill(wchar_t('0')) << hours << L":" << std::setw(2) << std::setfill(wchar_t('0')) << minutes << L":" << std::setw(2) << std::setfill(wchar_t('0')) << seconds; + return oss.str(); +#elif defined( __MINGW32__ ) +#define ADD_AS_PREFILLED( st, out ) \ + if ( st.length() == 0 ) \ + out += L"00"; \ + else if ( st.length() == 1 ) \ + out += L"0"; \ + out += st; + + std::wstring result; + ADD_AS_PREFILLED( hours, result ) + result += L":"; + ADD_AS_PREFILLED( minutes, result ) + result += L":"; + ADD_AS_PREFILLED( seconds, result ) + + return result; +#undef ADD_AS_PREFILLED #else + std::wostringstream oss; oss << std::setw(2) << std::setfill('0') << hours << L":" << std::setw(2) << std::setfill('0') << minutes << L":" << std::setw(2) << std::setfill('0') << seconds; -#endif return oss.str(); +#endif } diff --git a/shell/source/win32/simplemail/senddoc.cxx b/shell/source/win32/simplemail/senddoc.cxx index 6da545482f5e..bcd60253edf1 100644 --- a/shell/source/win32/simplemail/senddoc.cxx +++ b/shell/source/win32/simplemail/senddoc.cxx @@ -50,6 +50,7 @@ #include #include #include +#include #if OSL_DEBUG_LEVEL > 2 void dumpParameter(); -- cgit