From 065bbac8adfe29a09958570237d223457f235c6c Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Sat, 20 Feb 2016 13:08:46 +0100 Subject: patch 7.4.1363 Problem: Compiler warnings with tiny build. Solution: Add #ifdefs. --- src/gui_w32.c | 8 ++++++++ src/gui_w48.c | 3 +-- src/version.c | 2 ++ 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/gui_w32.c b/src/gui_w32.c index b496166e3..feeb6d402 100644 --- a/src/gui_w32.c +++ b/src/gui_w32.c @@ -36,6 +36,10 @@ static int s_directx_load_attempted = 0; # define IS_ENABLE_DIRECTX() (s_directx_enabled && s_dwc != NULL) #endif +#ifdef FEAT_MENU +static int gui_mswin_get_menu_height(int fix_window); +#endif + #if defined(FEAT_DIRECTX) || defined(PROTO) int directx_enabled(void) @@ -458,7 +462,9 @@ static UINT s_menu_id = 100; * stuff for dialogs, menus, tearoffs etc. */ static LRESULT APIENTRY dialog_callback(HWND, UINT, WPARAM, LPARAM); +#ifdef FEAT_TEAROFF static LRESULT APIENTRY tearoff_callback(HWND, UINT, WPARAM, LPARAM); +#endif static PWORD add_dialog_element( PWORD p, @@ -472,7 +478,9 @@ add_dialog_element( const char *caption); static LPWORD lpwAlign(LPWORD); 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); +#endif static void get_dialog_font_metrics(void); static int dialog_default_button = -1; diff --git a/src/gui_w48.c b/src/gui_w48.c index 4b755bd8f..eff3f3f80 100644 --- a/src/gui_w48.c +++ b/src/gui_w48.c @@ -138,7 +138,6 @@ typedef int WNDPROC; static void _OnPaint( HWND hwnd); 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_dlgfntwidth; /* width of the dialog font */ @@ -342,7 +341,7 @@ static LOGFONT sub_logfont; static LRESULT _OnImeNotify(HWND hWnd, DWORD dwCommand, DWORD dwData); #endif -#if defined(FEAT_MBYTE) && defined(WIN3264) +#if defined(FEAT_BROWSE) static char_u *convert_filter(char_u *s); #endif diff --git a/src/version.c b/src/version.c index 766937d6e..d2ae1ae6d 100644 --- a/src/version.c +++ b/src/version.c @@ -747,6 +747,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1363, /**/ 1362, /**/ -- cgit v1.2.1