1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
|
To: vim_dev@googlegroups.com
Subject: Patch 8.1.0788
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------
Patch 8.1.0788
Problem: Cannot build with tiny features.
Solution: Adjust #ifdefs.
Files: src/os_unix.c
*** ../vim-8.1.0787/src/os_unix.c 2019-01-20 18:39:26.572596405 +0100
--- src/os_unix.c 2019-01-20 23:42:11.639598189 +0100
***************
*** 984,989 ****
--- 984,990 ----
&& ((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,1031 ****
static void
mch_startjmp(void)
{
! #ifdef SIGHASARG
lc_signal = 0;
! #endif
lc_active = TRUE;
}
--- 1024,1032 ----
static void
mch_startjmp(void)
{
! # ifdef SIGHASARG
lc_signal = 0;
! # endif
lc_active = TRUE;
}
***************
*** 1063,1069 ****
int i;
#endif
! #if defined(HAVE_SETJMP_H)
/*
* Catch a crash in protected code.
* Restores the environment saved in lc_jump_env, which looks like
--- 1064,1070 ----
int i;
#endif
! #if defined(USING_SETJMP)
/*
* Catch a crash in protected code.
* Restores the environment saved in lc_jump_env, which looks like
***************
*** 1708,1714 ****
}
#if defined(FEAT_X11) && defined(FEAT_XCLIPBOARD)
! # if defined(HAVE_SETJMP_H)
/*
* An X IO Error handler, used to catch error while opening the display.
*/
--- 1709,1715 ----
}
#if defined(FEAT_X11) && defined(FEAT_XCLIPBOARD)
! # if defined(USING_SETJMP)
/*
* An X IO Error handler, used to catch error while opening the display.
*/
***************
*** 2100,2106 ****
return retval;
}
! /* Xutf8 functions are not avaialble 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. */
--- 2101,2107 ----
return retval;
}
! /* 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,2959 ****
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 */
case ERANGE:
default:
--- 2954,2960 ----
case ENOTSUP:
/* extended attributes aren't supported or enabled */
/* should a message be echoed? not sure... */
! return; /* leave because it isn't useful to continue */
case ERANGE:
default:
***************
*** 7360,7366 ****
/* If the handle is valid, try to get the function address. */
if (hinstLib != NULL)
{
! # ifdef HAVE_SETJMP_H
/*
* Catch a crash when calling the library function. For example when
* using a number where a string pointer is expected.
--- 7361,7367 ----
/* If the handle is valid, try to get the function address. */
if (hinstLib != NULL)
{
! # ifdef USING_SETJMP
/*
* Catch a crash when calling the library function. For example when
* using a number where a string pointer is expected.
***************
*** 7435,7441 ****
*string_result = vim_strsave(retval_str);
}
! # ifdef HAVE_SETJMP_H
mch_endjmp();
# ifdef SIGHASARG
if (lc_signal != 0)
--- 7436,7442 ----
*string_result = vim_strsave(retval_str);
}
! # ifdef USING_SETJMP
mch_endjmp();
# ifdef SIGHASARG
if (lc_signal != 0)
***************
*** 7494,7500 ****
if (app_context != NULL && xterm_Shell == (Widget)0)
{
int (*oldhandler)();
! # if defined(HAVE_SETJMP_H)
int (*oldIOhandler)();
# endif
# ifdef ELAPSED_FUNC
--- 7495,7501 ----
if (app_context != NULL && xterm_Shell == (Widget)0)
{
int (*oldhandler)();
! # if defined(USING_SETJMP)
int (*oldIOhandler)();
# endif
# ifdef ELAPSED_FUNC
***************
*** 7507,7513 ****
/* Ignore X errors while opening the display */
oldhandler = XSetErrorHandler(x_error_check);
! # if defined(HAVE_SETJMP_H)
/* Ignore X IO errors while opening the display */
oldIOhandler = XSetIOErrorHandler(x_IOerror_check);
mch_startjmp();
--- 7508,7514 ----
/* Ignore X errors while opening the display */
oldhandler = XSetErrorHandler(x_error_check);
! # if defined(USING_SETJMP)
/* Ignore X IO errors while opening the display */
oldIOhandler = XSetIOErrorHandler(x_IOerror_check);
mch_startjmp();
***************
*** 7523,7534 ****
"vim_xterm", "Vim_xterm", NULL, 0, &z, &strp);
if (xterm_dpy != NULL)
xterm_dpy_retry_count = 0;
! # if defined(HAVE_SETJMP_H)
mch_endjmp();
# endif
}
! # if defined(HAVE_SETJMP_H)
/* Now handle X IO errors normally. */
(void)XSetIOErrorHandler(oldIOhandler);
# endif
--- 7524,7535 ----
"vim_xterm", "Vim_xterm", NULL, 0, &z, &strp);
if (xterm_dpy != NULL)
xterm_dpy_retry_count = 0;
! # if defined(USING_SETJMP)
mch_endjmp();
# endif
}
! # if defined(USING_SETJMP)
/* Now handle X IO errors normally. */
(void)XSetIOErrorHandler(oldIOhandler);
# endif
*** ../vim-8.1.0787/src/version.c 2019-01-20 18:39:26.572596405 +0100
--- src/version.c 2019-01-20 23:40:34.340321522 +0100
***************
*** 793,794 ****
--- 793,796 ----
{ /* Add new patch number below this line */
+ /**/
+ 788,
/**/
--
God made the integers; all else is the work of Man.
-- Kronecker
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\ an exciting new programming language -- http://www.Zimbu.org ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
|
