patch 8.1.0787: compiler warning for unused function

Problem:    Compiler warning for unused function. (Tony Mechelynck)
Solution:   Tune #ifdef around setjmp functions.

diff --git a/src/os_unix.c b/src/os_unix.c
index 0a2682949edd5e799d00789f4fcae150309bf9e4..3919c1cf24686628b30100a299010b14d4554d5c 100644 (file)
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -980,7 +980,11 @@ sig_alarm SIGDEFARG(sigarg)
 }
 #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()
 static JMP_BUF lc_jump_env;
 
@@ -7490,9 +7494,9 @@ setup_term_clip(void)
     if (app_context != NULL && xterm_Shell == (Widget)0)
     {
        int (*oldhandler)();
-#if defined(HAVE_SETJMP_H)
+# if defined(HAVE_SETJMP_H)
        int (*oldIOhandler)();
-#endif
+# endif
 # ifdef ELAPSED_FUNC
        elapsed_T start_tv;
 
@@ -7503,7 +7507,7 @@ setup_term_clip(void)
        /* Ignore X errors while opening the display */
        oldhandler = XSetErrorHandler(x_error_check);
 
-#if defined(HAVE_SETJMP_H)
+# if defined(HAVE_SETJMP_H)
        /* Ignore X IO errors while opening the display */
        oldIOhandler = XSetIOErrorHandler(x_IOerror_check);
        mch_startjmp();
@@ -7513,21 +7517,21 @@ setup_term_clip(void)
            xterm_dpy = NULL;
        }
        else
-#endif
+# endif
        {
            xterm_dpy = XtOpenDisplay(app_context, xterm_display,
                    "vim_xterm", "Vim_xterm", NULL, 0, &z, &strp);
            if (xterm_dpy != NULL)
                xterm_dpy_retry_count = 0;
-#if defined(HAVE_SETJMP_H)
+# if defined(HAVE_SETJMP_H)
            mch_endjmp();
-#endif
+# endif
        }
 
-#if defined(HAVE_SETJMP_H)
+# if defined(HAVE_SETJMP_H)
        /* Now handle X IO errors normally. */
        (void)XSetIOErrorHandler(oldIOhandler);
-#endif
+# endif
        /* Now handle X errors normally. */
        (void)XSetErrorHandler(oldhandler);
 

diff --git a/src/version.c b/src/version.c
index 8f1c8bc752e1001612fd6c88362aab5a2ea3dc52..a47c7316958da8ae917e5660e9c136581567182f 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -791,6 +791,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    787,
 /**/
     786,
 /**/