Mercurial > vim

comparison src/os_unix.c @ 15559:59d32a45da1a v8.1.0787

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.1.0787: compiler warning for unused function commit https://github.com/vim/vim/commit/edce7420d044a503f38284188770efba87121bd6 Author: Bram Moolenaar <Bram@vim.org> Date: Sun Jan 20 18:39:30 2019 +0100 patch 8.1.0787: compiler warning for unused function Problem: Compiler warning for unused function. (Tony Mechelynck) Solution: Tune #ifdef around setjmp functions.
author Bram Moolenaar <Bram@vim.org>
date Sun, 20 Jan 2019 18:45:05 +0100
parents d89c5b339c2a
children ea9f1180d337
comparison
equal deleted inserted replaced
15558:97d57a9349d5 15559:59d32a45da1a
978 sig_alarm_called = TRUE; 978 sig_alarm_called = TRUE;
979 SIGRETURN; 979 SIGRETURN;
980 } 980 }
981 #endif 981 #endif
982 982
983 #if defined(HAVE_SETJMP_H) || defined(PROTO) 983 #if (defined(HAVE_SETJMP_H) \
984 && ((defined(FEAT_X11) && defined(FEAT_XCLIPBOARD)) \
985 || defined(FEAT_LIBCALL))) \
986 || defined(PROTO)
987
984 // argument to SETJMP() 988 // argument to SETJMP()
985 static JMP_BUF lc_jump_env; 989 static JMP_BUF lc_jump_env;
986 990
987 # ifdef SIGHASARG 991 # ifdef SIGHASARG
988 // Caught signal number, 0 when no was signal caught; used for mch_libcall(). 992 // Caught signal number, 0 when no was signal caught; used for mch_libcall().
7488 7492
7489 open_app_context(); 7493 open_app_context();
7490 if (app_context != NULL && xterm_Shell == (Widget)0) 7494 if (app_context != NULL && xterm_Shell == (Widget)0)
7491 { 7495 {
7492 int (*oldhandler)(); 7496 int (*oldhandler)();
7493 #if defined(HAVE_SETJMP_H) 7497 # if defined(HAVE_SETJMP_H)
7494 int (*oldIOhandler)(); 7498 int (*oldIOhandler)();
7495 #endif 7499 # endif
7496 # ifdef ELAPSED_FUNC 7500 # ifdef ELAPSED_FUNC
7497 elapsed_T start_tv; 7501 elapsed_T start_tv;
7498 7502
7499 if (p_verbose > 0) 7503 if (p_verbose > 0)
7500 ELAPSED_INIT(start_tv); 7504 ELAPSED_INIT(start_tv);
7501 # endif 7505 # endif
7502 7506
7503 /* Ignore X errors while opening the display */ 7507 /* Ignore X errors while opening the display */
7504 oldhandler = XSetErrorHandler(x_error_check); 7508 oldhandler = XSetErrorHandler(x_error_check);
7505 7509
7506 #if defined(HAVE_SETJMP_H) 7510 # if defined(HAVE_SETJMP_H)
7507 /* Ignore X IO errors while opening the display */ 7511 /* Ignore X IO errors while opening the display */
7508 oldIOhandler = XSetIOErrorHandler(x_IOerror_check); 7512 oldIOhandler = XSetIOErrorHandler(x_IOerror_check);
7509 mch_startjmp(); 7513 mch_startjmp();
7510 if (SETJMP(lc_jump_env) != 0) 7514 if (SETJMP(lc_jump_env) != 0)
7511 { 7515 {
7512 mch_didjmp(); 7516 mch_didjmp();
7513 xterm_dpy = NULL; 7517 xterm_dpy = NULL;
7514 } 7518 }
7515 else 7519 else
7516 #endif 7520 # endif
7517 { 7521 {
7518 xterm_dpy = XtOpenDisplay(app_context, xterm_display, 7522 xterm_dpy = XtOpenDisplay(app_context, xterm_display,
7519 "vim_xterm", "Vim_xterm", NULL, 0, &z, &strp); 7523 "vim_xterm", "Vim_xterm", NULL, 0, &z, &strp);
7520 if (xterm_dpy != NULL) 7524 if (xterm_dpy != NULL)
7521 xterm_dpy_retry_count = 0; 7525 xterm_dpy_retry_count = 0;
7522 #if defined(HAVE_SETJMP_H) 7526 # if defined(HAVE_SETJMP_H)
7523 mch_endjmp(); 7527 mch_endjmp();
7524 #endif 7528 # endif
7525 } 7529 }
7526 7530
7527 #if defined(HAVE_SETJMP_H) 7531 # if defined(HAVE_SETJMP_H)
7528 /* Now handle X IO errors normally. */ 7532 /* Now handle X IO errors normally. */
7529 (void)XSetIOErrorHandler(oldIOhandler); 7533 (void)XSetIOErrorHandler(oldIOhandler);
7530 #endif 7534 # endif
7531 /* Now handle X errors normally. */ 7535 /* Now handle X errors normally. */
7532 (void)XSetErrorHandler(oldhandler); 7536 (void)XSetErrorHandler(oldhandler);
7533 7537
7534 if (xterm_dpy == NULL) 7538 if (xterm_dpy == NULL)
7535 { 7539 {