aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-24 03:44:06 -04:00
Code Activity

patch 8.1.0787: compiler warning for unused function

Browse Source 
Problem:    Compiler warning for unused function. (Tony Mechelynck)
Solution:   Tune #ifdef around setjmp functions.
This commit is contained in:
Bram Moolenaar
2019-01-20 18:39:30 +01:00
parent 10772307c4
commit edce7420d0
2 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/os_unix.c
View File

@@ -980,7 +980,11 @@ sig_alarm SIGDEFARG(sigarg)
} }
#endif #endif
#if defined(HAVE_SETJMP_H) || defined(PROTO) #if (defined(HAVE_SETJMP_H) \
&& ((defined(FEAT_X11) && defined(FEAT_XCLIPBOARD)) \
|| defined(FEAT_LIBCALL))) \
|| defined(PROTO)
// argument to SETJMP() // argument to SETJMP()
static JMP_BUF lc_jump_env; static JMP_BUF lc_jump_env;
@@ -7490,9 +7494,9 @@ setup_term_clip(void)
if (app_context != NULL && xterm_Shell == (Widget)0) if (app_context != NULL && xterm_Shell == (Widget)0)
{ {
int (*oldhandler)(); int (*oldhandler)();
#if defined(HAVE_SETJMP_H) # if defined(HAVE_SETJMP_H)
int (*oldIOhandler)(); int (*oldIOhandler)();
#endif # endif
# ifdef ELAPSED_FUNC # ifdef ELAPSED_FUNC
elapsed_T start_tv; elapsed_T start_tv;
@@ -7503,7 +7507,7 @@ setup_term_clip(void)
/* Ignore X errors while opening the display */ /* Ignore X errors while opening the display */
oldhandler = XSetErrorHandler(x_error_check); oldhandler = XSetErrorHandler(x_error_check);
#if defined(HAVE_SETJMP_H) # if defined(HAVE_SETJMP_H)
/* Ignore X IO errors while opening the display */ /* Ignore X IO errors while opening the display */
oldIOhandler = XSetIOErrorHandler(x_IOerror_check); oldIOhandler = XSetIOErrorHandler(x_IOerror_check);
mch_startjmp(); mch_startjmp();
@@ -7513,21 +7517,21 @@ setup_term_clip(void)
xterm_dpy = NULL; xterm_dpy = NULL;
} }
else else
#endif # endif
{ {
xterm_dpy = XtOpenDisplay(app_context, xterm_display, xterm_dpy = XtOpenDisplay(app_context, xterm_display,
"vim_xterm", "Vim_xterm", NULL, 0, &z, &strp); "vim_xterm", "Vim_xterm", NULL, 0, &z, &strp);
if (xterm_dpy != NULL) if (xterm_dpy != NULL)
xterm_dpy_retry_count = 0; xterm_dpy_retry_count = 0;
#if defined(HAVE_SETJMP_H) # if defined(HAVE_SETJMP_H)
mch_endjmp(); mch_endjmp();
#endif # endif
} }
#if defined(HAVE_SETJMP_H) # if defined(HAVE_SETJMP_H)
/* Now handle X IO errors normally. */ /* Now handle X IO errors normally. */
(void)XSetIOErrorHandler(oldIOhandler); (void)XSetIOErrorHandler(oldIOhandler);
#endif # endif
/* Now handle X errors normally. */ /* Now handle X errors normally. */
(void)XSetErrorHandler(oldhandler); (void)XSetErrorHandler(oldhandler);

2
src/version.c
View File

@@ -791,6 +791,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 */
/**/
787,
/**/ /**/
786, 786,
/**/ /**/