To: vim-dev@vim.org Subject: Patch 6.1a.004 (extra) Fcc: outbox From: Bram Moolenaar MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 6.1a.004 (extra) Problem: MINGW: undefined type. (Ron Aaron) Solution: Make GetCompositionString_inUCS2() static. Files: src/gui_w32.c, src/gui_w48.c, src/proto/gui_w32.pro *** ../vim61a.003/src/gui_w32.c Sun Feb 24 19:36:18 2002 --- src/gui_w32.c Mon Feb 25 09:39:16 2002 *************** *** 1229,1237 **** gui.currBgColor = color; } ! #if (defined(FEAT_MBYTE) && defined(FEAT_MBYTE_IME)) || defined(PROTO) /* * Multi-byte handling, by Sung-Hoon Baek */ static void --- 1229,1238 ---- gui.currBgColor = color; } ! #if defined(FEAT_MBYTE) && defined(FEAT_MBYTE_IME) /* * Multi-byte handling, by Sung-Hoon Baek + * First static functions (no prototypes generated). */ static void *************** *** 1395,1404 **** } /* ! * get the currnet composition string, in UCS-2; len is the number of * Unicode characters */ ! unsigned short * GetCompositionString_inUCS2(HIMC hIMC, DWORD GCS, int *len) { LONG ret; --- 1396,1405 ---- } /* ! * get the current composition string, in UCS-2; len is the number of * Unicode characters */ ! static unsigned short * GetCompositionString_inUCS2(HIMC hIMC, DWORD GCS, int *len) { LONG ret; *************** *** 1491,1496 **** --- 1492,1501 ---- } return NULL; } + + #endif + /* For global functions we need prototypes. */ + #if (defined(FEAT_MBYTE) && defined(FEAT_MBYTE_IME)) || defined(PROTO) /* * set font to IM. *** ../vim61a.003/src/gui_w48.c Sun Feb 24 18:16:15 2002 --- src/gui_w48.c Mon Feb 25 09:37:01 2002 *************** *** 113,119 **** # define LPCSTR int # undef MSG # define MSG int - typedef void *HIMC; #endif #ifndef GET_X_LPARAM --- 113,118 ---- *** ../vim61a.003/src/proto/gui_w32.pro Sun Feb 24 18:16:16 2002 --- src/proto/gui_w32.pro Mon Feb 25 09:39:31 2002 *************** *** 59,65 **** void gui_mch_set_font __ARGS((GuiFont font)); void gui_mch_set_fg_color __ARGS((guicolor_T color)); void gui_mch_set_bg_color __ARGS((guicolor_T color)); - unsigned short *GetCompositionString_inUCS2 __ARGS((HIMC hIMC, DWORD GCS, int *len)); void im_set_font __ARGS((LOGFONT *lf)); void im_set_position __ARGS((int row, int col)); void im_set_active __ARGS((int active)); --- 59,64 ---- *** ../vim61a.003/src/version.c Mon Feb 25 22:17:26 2002 --- src/version.c Mon Feb 25 22:30:57 2002 *************** *** 608,609 **** --- 608,611 ---- { /* Add new patch number below this line */ + /**/ + 4, /**/ -- Due knot trussed yore spell chequer two fined awl miss steaks. /// Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net \\\ /// Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim \\\ \\\ Project leader for A-A-P -- http://www.a-a-p.org /// \\\ Help me helping AIDS orphans in Uganda - http://iccf-holland.org ///