diff options
| author | Bram Moolenaar <Bram@vim.org> | 2020-04-30 22:51:01 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2020-04-30 22:51:01 +0200 |
| commit | 9e175141f3437627c314257ebf894c29c71a9ded (patch) | |
| tree | 788b4fabb9b76cf9638e9b59cd34517b95fbcbe6 | |
| parent | 6adb9ea0a6ca01414f4b591f379b0f829a8273c0 (diff) | |
| download | vim-git-9e175141f3437627c314257ebf894c29c71a9ded.tar.gz | |
patch 8.2.0671: Haiku: compiler warningsv8.2.0671
Problem: Haiku: compiler warnings.
Solution: Avoid the warnings. Drop display_errors() copy. (Emir Sari,
closes #6018)
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | src/gui.c | 3 | ||||
| -rw-r--r-- | src/gui_haiku.cc | 36 | ||||
| -rw-r--r-- | src/version.c | 2 |
4 files changed, 6 insertions, 36 deletions
diff --git a/.gitignore b/.gitignore index 2dc119476..8623fdebf 100644 --- a/.gitignore +++ b/.gitignore @@ -5,6 +5,7 @@ src/xxd/xxd src/auto/if_perl.c src/auto/gui_gtk_gresources.c src/auto/gui_gtk_gresources.h +src/auto/os_haiku.rdef src/objects/.dirstamp src/objects src/tags @@ -5107,7 +5107,8 @@ gui_find_iconfile(char_u *name, char_u *buffer, char *ext) # endif #endif -#if defined(FEAT_GUI_GTK) || defined(FEAT_GUI_X11) || defined(PROTO) +#if defined(FEAT_GUI_GTK) || defined(FEAT_GUI_X11)|| defined(FEAT_GUI_HAIKU) \ + || defined(PROTO) void display_errors(void) { diff --git a/src/gui_haiku.cc b/src/gui_haiku.cc index 2dbd852f2..ff460adf2 100644 --- a/src/gui_haiku.cc +++ b/src/gui_haiku.cc @@ -551,7 +551,7 @@ struct VimMsg { }; #define RGB(r, g, b) ((char_u)(r) << 16 | (char_u)(g) << 8 | (char_u)(b) << 0) -#define GUI_TO_RGB(g) { (g) >> 16, (g) >> 8, (g) >> 0, 255 } +#define GUI_TO_RGB(g) { (char_u)((g) >> 16), (char_u)((g) >> 8), (char_u)((g) >> 0), 255 } // ---------------- end of header part ---------------- @@ -3990,40 +3990,6 @@ gui_mch_adjust_charheight() return OK; } -/* - * Display the saved error message(s). - */ -#ifdef USE_MCH_ERRMSG - void -display_errors(void) -{ - char *p; - char_u pError[256]; - - if (error_ga.ga_data == NULL) - return; - - // avoid putting up a message box with blanks only - for (p = (char *)error_ga.ga_data; *p; ++p) - if (!isspace(*p)) - { - if (STRLEN(p) > 255) - pError[0] = 255; - else - pError[0] = STRLEN(p); - - STRNCPY(&pError[1], p, pError[0]); -// ParamText(pError, nil, nil, nil); -// Alert(128, nil); - break; - // TODO: handled message longer than 256 chars - // use auto-sizeable alert - // or dialog with scrollbars (TextEdit zone) - } - ga_clear(&error_ga); -} -#endif - void gui_mch_getmouse(int *x, int *y) { diff --git a/src/version.c b/src/version.c index 8b9fec551..5e35da8a0 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 */ /**/ + 671, +/**/ 670, /**/ 669, |