aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-25 03:54:15 -04:00
Code Activity

patch 7.4.1363

Browse Source 
Problem:    Compiler warnings with tiny build.
Solution:   Add #ifdefs.
This commit is contained in:
Bram Moolenaar
2016-02-20 13:08:46 +01:00
parent 8600ace876
commit 065bbac8ad
3 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/gui_w32.c
View File

@@ -36,6 +36,10 @@ static int s_directx_load_attempted = 0;
# define IS_ENABLE_DIRECTX() (s_directx_enabled && s_dwc != NULL) # define IS_ENABLE_DIRECTX() (s_directx_enabled && s_dwc != NULL)
#endif #endif
#ifdef FEAT_MENU
static int gui_mswin_get_menu_height(int fix_window);
#endif
#if defined(FEAT_DIRECTX) || defined(PROTO) #if defined(FEAT_DIRECTX) || defined(PROTO)
int int
directx_enabled(void) directx_enabled(void)
@@ -458,7 +462,9 @@ static UINT s_menu_id = 100;
* stuff for dialogs, menus, tearoffs etc. * stuff for dialogs, menus, tearoffs etc.
*/ */
static LRESULT APIENTRY dialog_callback(HWND, UINT, WPARAM, LPARAM); static LRESULT APIENTRY dialog_callback(HWND, UINT, WPARAM, LPARAM);
#ifdef FEAT_TEAROFF
static LRESULT APIENTRY tearoff_callback(HWND, UINT, WPARAM, LPARAM); static LRESULT APIENTRY tearoff_callback(HWND, UINT, WPARAM, LPARAM);
#endif
static PWORD static PWORD
add_dialog_element( add_dialog_element(
PWORD p, PWORD p,
@@ -472,7 +478,9 @@ add_dialog_element(
const char *caption); const char *caption);
static LPWORD lpwAlign(LPWORD); static LPWORD lpwAlign(LPWORD);
static int nCopyAnsiToWideChar(LPWORD, LPSTR); static int nCopyAnsiToWideChar(LPWORD, LPSTR);
#if defined(FEAT_MENU) && defined(FEAT_TEAROFF)
static void gui_mch_tearoff(char_u *title, vimmenu_T *menu, int initX, int initY); static void gui_mch_tearoff(char_u *title, vimmenu_T *menu, int initX, int initY);
#endif
static void get_dialog_font_metrics(void); static void get_dialog_font_metrics(void);
static int dialog_default_button = -1; static int dialog_default_button = -1;

3
src/gui_w48.c
View File

@@ -138,7 +138,6 @@ typedef int WNDPROC;
static void _OnPaint( HWND hwnd); static void _OnPaint( HWND hwnd);
static void clear_rect(RECT *rcp); static void clear_rect(RECT *rcp);
static int gui_mswin_get_menu_height(int fix_window);
static WORD s_dlgfntheight; /* height of the dialog font */ static WORD s_dlgfntheight; /* height of the dialog font */
static WORD s_dlgfntwidth; /* width of the dialog font */ static WORD s_dlgfntwidth; /* width of the dialog font */
@@ -342,7 +341,7 @@ static LOGFONT sub_logfont;
static LRESULT _OnImeNotify(HWND hWnd, DWORD dwCommand, DWORD dwData); static LRESULT _OnImeNotify(HWND hWnd, DWORD dwCommand, DWORD dwData);
#endif #endif
#if defined(FEAT_MBYTE) && defined(WIN3264) #if defined(FEAT_BROWSE)
static char_u *convert_filter(char_u *s); static char_u *convert_filter(char_u *s);
#endif #endif

2
src/version.c
View File

@@ -747,6 +747,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 */
/**/
1363,
/**/ /**/
1362, 1362,
/**/ /**/