aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

updated for version 7.3.870

Browse Source 
Problem:    Compiler warnings when using MingW 4.5.3.
Solution:   Do not use MAKEINTRESOURCE. Adjust #if. (Ken Takata)
This commit is contained in:
Bram Moolenaar 2013-03-19 14:48:29 +01:00
parent 0c279bbb9c
commit af62ff3696
6 changed files with 27 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui_w32.c
View File

@ -1614,7 +1614,7 @@ gui_mch_init(void)
#endif #endif
#ifdef FEAT_EVAL #ifdef FEAT_EVAL
# if _MSC_VER < 1400 # ifndef HandleToLong
/* HandleToLong() only exists in compilers that can do 64 bit builds */ /* HandleToLong() only exists in compilers that can do 64 bit builds */
# define HandleToLong(h) ((long)(h)) # define HandleToLong(h) ((long)(h))
# endif # endif

38
src/gui_w48.c
View File

@ -3265,27 +3265,27 @@ gui_mch_settitle(
* misc2.c! */ * misc2.c! */
static LPCSTR mshape_idcs[] = static LPCSTR mshape_idcs[] =
{ {
MAKEINTRESOURCE(IDC_ARROW), /* arrow */ IDC_ARROW, /* arrow */
MAKEINTRESOURCE(0), /* blank */ MAKEINTRESOURCE(0), /* blank */
MAKEINTRESOURCE(IDC_IBEAM), /* beam */ IDC_IBEAM, /* beam */
MAKEINTRESOURCE(IDC_SIZENS), /* updown */ IDC_SIZENS, /* updown */
MAKEINTRESOURCE(IDC_SIZENS), /* udsizing */ IDC_SIZENS, /* udsizing */
MAKEINTRESOURCE(IDC_SIZEWE), /* leftright */ IDC_SIZEWE, /* leftright */
MAKEINTRESOURCE(IDC_SIZEWE), /* lrsizing */ IDC_SIZEWE, /* lrsizing */
MAKEINTRESOURCE(IDC_WAIT), /* busy */ IDC_WAIT, /* busy */
#ifdef WIN3264 #ifdef WIN3264
MAKEINTRESOURCE(IDC_NO), /* no */ IDC_NO, /* no */
#else #else
MAKEINTRESOURCE(IDC_ICON), /* no */ IDC_ICON, /* no */
#endif #endif
MAKEINTRESOURCE(IDC_ARROW), /* crosshair */ IDC_ARROW, /* crosshair */
MAKEINTRESOURCE(IDC_ARROW), /* hand1 */ IDC_ARROW, /* hand1 */
MAKEINTRESOURCE(IDC_ARROW), /* hand2 */ IDC_ARROW, /* hand2 */
MAKEINTRESOURCE(IDC_ARROW), /* pencil */ IDC_ARROW, /* pencil */
MAKEINTRESOURCE(IDC_ARROW), /* question */ IDC_ARROW, /* question */
MAKEINTRESOURCE(IDC_ARROW), /* right-arrow */ IDC_ARROW, /* right-arrow */
MAKEINTRESOURCE(IDC_UPARROW), /* up-arrow */ IDC_UPARROW, /* up-arrow */
MAKEINTRESOURCE(IDC_ARROW) /* last one */ IDC_ARROW /* last one */
}; };
void void
@ -3298,7 +3298,7 @@ mch_set_mouse_shape(int shape)
else else
{ {
if (shape >= MSHAPE_NUMBERED) if (shape >= MSHAPE_NUMBERED)
idc = MAKEINTRESOURCE(IDC_ARROW); idc = IDC_ARROW;
else else
idc = mshape_idcs[shape]; idc = mshape_idcs[shape];
#ifdef SetClassLongPtr #ifdef SetClassLongPtr

2
src/os_mswin.c
View File

@ -184,12 +184,14 @@ char * _fullpath(char *buf, char *fname, int len)
} }
# endif # endif
# if !defined(__MINGW32__) || (__GNUC__ < 4)
int _chdrive(int drive) int _chdrive(int drive)
{ {
char temp [3] = "-:"; char temp [3] = "-:";
temp[0] = drive + 'A' - 1; temp[0] = drive + 'A' - 1;
return !SetCurrentDirectory(temp); return !SetCurrentDirectory(temp);
} }
# endif
#else #else
# ifdef __BORLANDC__ # ifdef __BORLANDC__
/* being a more ANSI compliant compiler, BorlandC doesn't define _stricoll: /* being a more ANSI compliant compiler, BorlandC doesn't define _stricoll:

4
src/os_win32.c
View File

@ -163,7 +163,7 @@ static PFNGCKLN s_pfnGetConsoleKeyboardLayoutName = NULL;
/* Enable common dialogs input unicode from IME if posible. */ /* Enable common dialogs input unicode from IME if posible. */
#ifdef FEAT_MBYTE #ifdef FEAT_MBYTE
LRESULT (WINAPI *pDispatchMessage)(LPMSG) = DispatchMessage; LRESULT (WINAPI *pDispatchMessage)(CONST MSG *) = DispatchMessage;
BOOL (WINAPI *pGetMessage)(LPMSG, HWND, UINT, UINT) = GetMessage; BOOL (WINAPI *pGetMessage)(LPMSG, HWND, UINT, UINT) = GetMessage;
BOOL (WINAPI *pIsDialogMessage)(HWND, LPMSG) = IsDialogMessage; BOOL (WINAPI *pIsDialogMessage)(HWND, LPMSG) = IsDialogMessage;
BOOL (WINAPI *pPeekMessage)(LPMSG, HWND, UINT, UINT, UINT) = PeekMessage; BOOL (WINAPI *pPeekMessage)(LPMSG, HWND, UINT, UINT, UINT) = PeekMessage;
@ -3464,7 +3464,7 @@ sub_process_writer(LPVOID param)
&& (lnum != curbuf->b_ml.ml_line_count && (lnum != curbuf->b_ml.ml_line_count
|| curbuf->b_p_eol))) || curbuf->b_p_eol)))
{ {
WriteFile(g_hChildStd_IN_Wr, "\n", 1, &ignored, NULL); WriteFile(g_hChildStd_IN_Wr, "\n", 1, (LPDWORD)&ignored, NULL);
} }
++lnum; ++lnum;

2
src/os_win32.h
View File

@ -204,7 +204,7 @@ Trace(char *pszFormat, ...);
/* Enable common dialogs input unicode from IME if posible. */ /* Enable common dialogs input unicode from IME if posible. */
#ifdef FEAT_MBYTE #ifdef FEAT_MBYTE
/* The variables are defined in os_win32.c. */ /* The variables are defined in os_win32.c. */
extern LRESULT (WINAPI *pDispatchMessage)(LPMSG); extern LRESULT (WINAPI *pDispatchMessage)(CONST MSG *);
extern BOOL (WINAPI *pGetMessage)(LPMSG, HWND, UINT, UINT); extern BOOL (WINAPI *pGetMessage)(LPMSG, HWND, UINT, UINT);
extern BOOL (WINAPI *pIsDialogMessage)(HWND, LPMSG); extern BOOL (WINAPI *pIsDialogMessage)(HWND, LPMSG);
extern BOOL (WINAPI *pPeekMessage)(LPMSG, HWND, UINT, UINT, UINT); extern BOOL (WINAPI *pPeekMessage)(LPMSG, HWND, UINT, UINT, UINT);

2
src/version.c
View File

@ -728,6 +728,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
870,
/**/ /**/
869, 869,
/**/ /**/