diff options
| author | Bram Moolenaar <Bram@vim.org> | 2012-08-29 16:34:27 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2012-08-29 16:34:27 +0200 |
| commit | 0551410a14d8fdfa657392c0d6b3cc8dd643752d (patch) | |
| tree | e304ae9e2dbc3663f83b5645c55e818a965b6c94 /src | |
| parent | 3633dc012919238e66c006b1037e2a1fece2b18d (diff) | |
| download | vim-0551410a14d8fdfa657392c0d6b3cc8dd643752d.zip | |
updated for version 7.3.644
Problem: Dead code for BeOS GUI.
Solution: Remove unused __BEOS__ stuff.
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui.c | 5 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 3 insertions, 4 deletions
@@ -37,8 +37,7 @@ static void gui_set_fg_color __ARGS((char_u *name)); static void gui_set_bg_color __ARGS((char_u *name)); static win_T *xy2win __ARGS((int x, int y)); -#if defined(UNIX) && !defined(__BEOS__) && !defined(MACOS_X) \ - && !defined(__APPLE__) +#if defined(UNIX) && !defined(MACOS_X) && !defined(__APPLE__) # define MAY_FORK static void gui_do_fork __ARGS((void)); @@ -784,11 +783,9 @@ error: gui_exit(rc) int rc; { -#ifndef __BEOS__ /* don't free the fonts, it leads to a BUS error * richard@whitequeen.com Jul 99 */ free_highlight_fonts(); -#endif gui.in_use = FALSE; gui_mch_exit(rc); } diff --git a/src/version.c b/src/version.c index 078d87509..70bcc9926 100644 --- a/src/version.c +++ b/src/version.c @@ -720,6 +720,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 644, +/**/ 643, /**/ 642, |