diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2009-01-20 16:36:21 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2009-01-20 16:36:21 +0000 |
| commit | 0c2b81b34d795bf005a464d6617bcf7d7a841fc5 (patch) | |
| tree | 738765490f4a2f0a648c3380cf7bdea894878b6f /external | |
| parent | ef6cb13a304ed22d5cf22b7ccf623693d6be8726 (diff) | |
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
Diffstat (limited to 'external')
| -rw-r--r-- | external/mingwheaders/makefile.mk | 1 | ||||
| -rw-r--r-- | external/mingwheaders/mingw_headers.patch | 27 |
2 files changed, 28 insertions, 0 deletions
diff --git a/external/mingwheaders/makefile.mk b/external/mingwheaders/makefile.mk index 00dfd7dab6a5..8e25bfccb9e0 100644 --- a/external/mingwheaders/makefile.mk +++ b/external/mingwheaders/makefile.mk @@ -61,6 +61,7 @@ FILES_TO_COPY_FROM_MINGW=excpt.h \ FILES_TO_COPY_FROM_W32API=amvideo.h \ bdatypes.h \ + imm.h \ oaidl.h \ objfwd.h \ objidl.h \ diff --git a/external/mingwheaders/mingw_headers.patch b/external/mingwheaders/mingw_headers.patch index 96a3ccc73d71..1418137627b1 100644 --- a/external/mingwheaders/mingw_headers.patch +++ b/external/mingwheaders/mingw_headers.patch @@ -227,6 +227,33 @@ } MPEG2_TRANSPORT_STRIDE; typedef struct { ULONG ulPID; +--- include/imm.h.orig 2007-12-27 23:07:19.000000000 +0900 ++++ include/imm.h 2008-11-08 07:28:48.983375000 +0900 +@@ -105,6 +105,7 @@ + #define UI_CAP_ROTANY 4 + #define SCS_CAP_COMPSTR 1 + #define SCS_CAP_MAKEREAD 2 ++#define SCS_CAP_SETRECONVERTSTRING 4 + #define SELECT_CAP_CONVERSION 1 + #define SELECT_CAP_SENTENCE 2 + #define GGL_LEVEL 1 +@@ -208,6 +209,7 @@ + #define IME_REGWORD_STYLE_USER_FIRST 0x80000000 + #define IME_REGWORD_STYLE_USER_LAST 0xFFFFFFFF + #define IMR_RECONVERTSTRING 4 ++#define IMR_CONFIRMRECONVERTSTRING 5 + #define IMR_QUERYCHARPOSITION 6 + #define SOFTKEYBOARD_TYPE_T1 1 + #define SOFTKEYBOARD_TYPE_C1 2 +@@ -285,7 +287,7 @@ + DWORD dwCompStrOffset; + DWORD dwTargetStrLen; + DWORD dwTargetStrOffset; +-} RECONVERTSTRING, *PRECONVERTSTRING; ++} RECONVERTSTRING, *PRECONVERTSTRING, *LPRECONVERTSTRING; + typedef struct tagREGISTERWORDA { + LPSTR lpReading; + LPSTR lpWord; --- include/oaidl.h.orig 2006-11-19 08:08:33.000000000 +0900 +++ include/oaidl.h 2007-01-20 09:08:24.625000000 +0900 @@ -78,6 +78,8 @@ |