patch 8.1.0788: cannot build with tiny features
Problem: Cannot build with tiny features.
Solution: Adjust #ifdefs.
diff --git a/src/os_unix.c b/src/os_unix.c
index 3919c1c..33ef781 100644
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -984,6 +984,7 @@
&& ((defined(FEAT_X11) && defined(FEAT_XCLIPBOARD)) \
|| defined(FEAT_LIBCALL))) \
|| defined(PROTO)
+# define USING_SETJMP 1
// argument to SETJMP()
static JMP_BUF lc_jump_env;
@@ -1023,9 +1024,9 @@
static void
mch_startjmp(void)
{
-#ifdef SIGHASARG
+# ifdef SIGHASARG
lc_signal = 0;
-#endif
+# endif
lc_active = TRUE;
}
@@ -1063,7 +1064,7 @@
int i;
#endif
-#if defined(HAVE_SETJMP_H)
+#if defined(USING_SETJMP)
/*
* Catch a crash in protected code.
* Restores the environment saved in lc_jump_env, which looks like
@@ -1708,7 +1709,7 @@
}
#if defined(FEAT_X11) && defined(FEAT_XCLIPBOARD)
-# if defined(HAVE_SETJMP_H)
+# if defined(USING_SETJMP)
/*
* An X IO Error handler, used to catch error while opening the display.
*/
@@ -2100,7 +2101,7 @@
return retval;
}
-/* Xutf8 functions are not avaialble on older systems. Note that on some
+/* Xutf8 functions are not available on older systems. Note that on some
* systems X_HAVE_UTF8_STRING may be defined in a header file but
* Xutf8SetWMProperties() is not in the X11 library. Configure checks for
* that and defines HAVE_XUTF8SETWMPROPERTIES. */
@@ -2953,7 +2954,7 @@
case ENOTSUP:
/* extended attributes aren't supported or enabled */
/* should a message be echoed? not sure... */
- return; /* leave because it isn't usefull to continue */
+ return; /* leave because it isn't useful to continue */
case ERANGE:
default:
@@ -7360,7 +7361,7 @@
/* If the handle is valid, try to get the function address. */
if (hinstLib != NULL)
{
-# ifdef HAVE_SETJMP_H
+# ifdef USING_SETJMP
/*
* Catch a crash when calling the library function. For example when
* using a number where a string pointer is expected.
@@ -7435,7 +7436,7 @@
*string_result = vim_strsave(retval_str);
}
-# ifdef HAVE_SETJMP_H
+# ifdef USING_SETJMP
mch_endjmp();
# ifdef SIGHASARG
if (lc_signal != 0)
@@ -7494,7 +7495,7 @@
if (app_context != NULL && xterm_Shell == (Widget)0)
{
int (*oldhandler)();
-# if defined(HAVE_SETJMP_H)
+# if defined(USING_SETJMP)
int (*oldIOhandler)();
# endif
# ifdef ELAPSED_FUNC
@@ -7507,7 +7508,7 @@
/* Ignore X errors while opening the display */
oldhandler = XSetErrorHandler(x_error_check);
-# if defined(HAVE_SETJMP_H)
+# if defined(USING_SETJMP)
/* Ignore X IO errors while opening the display */
oldIOhandler = XSetIOErrorHandler(x_IOerror_check);
mch_startjmp();
@@ -7523,12 +7524,12 @@
"vim_xterm", "Vim_xterm", NULL, 0, &z, &strp);
if (xterm_dpy != NULL)
xterm_dpy_retry_count = 0;
-# if defined(HAVE_SETJMP_H)
+# if defined(USING_SETJMP)
mch_endjmp();
# endif
}
-# if defined(HAVE_SETJMP_H)
+# if defined(USING_SETJMP)
/* Now handle X IO errors normally. */
(void)XSetIOErrorHandler(oldIOhandler);
# endif