commit edce7420d044a503f38284188770efba87121bd6
author Bram Moolenaar <Bram@vim.org> Sun Jan 20 18:39:30 2019 +0100
committer Bram Moolenaar <Bram@vim.org> Sun Jan 20 18:39:30 2019 +0100
tree 96cb82fbd48229305b85a06a9cf4cfa7f71e1fae
parent 10772307c4e5299ed45470f92779f089a00d841e

patch 8.1.0787: compiler warning for unused function

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

src/os_unix.c

diff --git a/src/os_unix.c b/src/os_unix.c
index 0a26829..3919c1c 100644
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -980,7 +980,11 @@
 }
 #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 @@
     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 @@
 	/* 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 @@
 	    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);