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
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
|
To: vim-dev@vim.org
Subject: Patch 7.2.371
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------
Patch 7.2.371
Problem: Build problems on Tandem NonStop.
Solution: A few changes to #ifdefs (Joachim Schmitz)
Files: src/auto/configure, src/configure.in, src/config.h.in, src/vim.h,
src/if_cscope.c, src/osdef1.h.in, src/tag.c
*** ../vim-7.2.370/src/auto/configure 2010-02-17 16:23:03.000000000 +0100
--- src/auto/configure 2010-02-24 14:27:00.000000000 +0100
***************
*** 14038,14046 ****
!
!
! for ac_func in bcmp fchdir fchown fseeko fsync ftello getcwd getpseudotty \
getpwnam getpwuid getrlimit gettimeofday getwd lstat memcmp \
memset mkdtemp nanosleep opendir putenv qsort readlink select setenv \
setpgid setsid sigaltstack sigstack sigset sigsetjmp sigaction \
--- 14038,14044 ----
! for ac_func in bcmp fchdir fchown fsync getcwd getpseudotty \
getpwnam getpwuid getrlimit gettimeofday getwd lstat memcmp \
memset mkdtemp nanosleep opendir putenv qsort readlink select setenv \
setpgid setsid sigaltstack sigstack sigset sigsetjmp sigaction \
***************
*** 14146,14151 ****
--- 14144,14281 ----
fi
done
+ { $as_echo "$as_me:$LINENO: checking for _LARGEFILE_SOURCE value needed for large files" >&5
+ $as_echo_n "checking for _LARGEFILE_SOURCE value needed for large files... " >&6; }
+ if test "${ac_cv_sys_largefile_source+set}" = set; then
+ $as_echo_n "(cached) " >&6
+ else
+ while :; do
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+ #include <sys/types.h> /* for off_t */
+ #include <stdio.h>
+ int
+ main ()
+ {
+ int (*fp) (FILE *, off_t, int) = fseeko;
+ return fseeko (stdin, 0, 0) && fp (stdin, 0, 0);
+ ;
+ return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+ if { (ac_try="$ac_link"
+ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+ eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+ $as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
+ ac_cv_sys_largefile_source=no; break
+ else
+ $as_echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+
+ fi
+
+ rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+ #define _LARGEFILE_SOURCE 1
+ #include <sys/types.h> /* for off_t */
+ #include <stdio.h>
+ int
+ main ()
+ {
+ int (*fp) (FILE *, off_t, int) = fseeko;
+ return fseeko (stdin, 0, 0) && fp (stdin, 0, 0);
+ ;
+ return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+ if { (ac_try="$ac_link"
+ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+ eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+ $as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
+ ac_cv_sys_largefile_source=1; break
+ else
+ $as_echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+
+ fi
+
+ rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ ac_cv_sys_largefile_source=unknown
+ break
+ done
+ fi
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_sys_largefile_source" >&5
+ $as_echo "$ac_cv_sys_largefile_source" >&6; }
+ case $ac_cv_sys_largefile_source in #(
+ no | unknown) ;;
+ *)
+ cat >>confdefs.h <<_ACEOF
+ #define _LARGEFILE_SOURCE $ac_cv_sys_largefile_source
+ _ACEOF
+ ;;
+ esac
+ rm -rf conftest*
+
+ # We used to try defining _XOPEN_SOURCE=500 too, to work around a bug
+ # in glibc 2.1.3, but that breaks too many other things.
+ # If you want fseeko and ftello with glibc, upgrade to a fixed glibc.
+ if test $ac_cv_sys_largefile_source != unknown; then
+
+ cat >>confdefs.h <<\_ACEOF
+ #define HAVE_FSEEKO 1
+ _ACEOF
+
+ fi
+
{ $as_echo "$as_me:$LINENO: checking for st_blksize" >&5
$as_echo_n "checking for st_blksize... " >&6; }
*** ../vim-7.2.370/src/configure.in 2010-02-17 16:23:03.000000000 +0100
--- src/configure.in 2010-02-24 14:18:49.000000000 +0100
***************
*** 2642,2655 ****
AC_DEFINE(BAD_GETCWD)
fi
! dnl Check for functions in one big call, to reduce the size of configure
! AC_CHECK_FUNCS(bcmp fchdir fchown fseeko fsync ftello getcwd getpseudotty \
getpwnam getpwuid getrlimit gettimeofday getwd lstat memcmp \
memset mkdtemp nanosleep opendir putenv qsort readlink select setenv \
setpgid setsid sigaltstack sigstack sigset sigsetjmp sigaction \
sigvec strcasecmp strerror strftime stricmp strncasecmp \
strnicmp strpbrk strtol tgetent towlower towupper iswupper \
usleep utime utimes)
dnl fstatfs() can take 2 to 4 arguments, try to use st_blksize if possible
AC_MSG_CHECKING(for st_blksize)
--- 2642,2657 ----
AC_DEFINE(BAD_GETCWD)
fi
! dnl Check for functions in one big call, to reduce the size of configure.
! dnl Can only be used for functions that do not require any include.
! AC_CHECK_FUNCS(bcmp fchdir fchown fsync getcwd getpseudotty \
getpwnam getpwuid getrlimit gettimeofday getwd lstat memcmp \
memset mkdtemp nanosleep opendir putenv qsort readlink select setenv \
setpgid setsid sigaltstack sigstack sigset sigsetjmp sigaction \
sigvec strcasecmp strerror strftime stricmp strncasecmp \
strnicmp strpbrk strtol tgetent towlower towupper iswupper \
usleep utime utimes)
+ AC_FUNC_FSEEKO
dnl fstatfs() can take 2 to 4 arguments, try to use st_blksize if possible
AC_MSG_CHECKING(for st_blksize)
*** ../vim-7.2.370/src/config.h.in 2009-11-17 17:13:03.000000000 +0100
--- src/config.h.in 2010-02-24 14:20:26.000000000 +0100
***************
*** 144,150 ****
#undef HAVE_FCHOWN
#undef HAVE_FSEEKO
#undef HAVE_FSYNC
- #undef HAVE_FTELLO
#undef HAVE_GETCWD
#undef HAVE_GETPSEUDOTTY
#undef HAVE_GETPWNAM
--- 144,149 ----
*** ../vim-7.2.370/src/vim.h 2010-02-03 15:14:15.000000000 +0100
--- src/vim.h 2010-02-24 14:08:14.000000000 +0100
***************
*** 52,58 ****
/* user ID of root is usually zero, but not for everybody */
#ifdef __TANDEM
! # define _TANDEM_SOURCE
# include <floss.h>
# define ROOT_UID 65535
#else
--- 52,60 ----
/* user ID of root is usually zero, but not for everybody */
#ifdef __TANDEM
! # ifndef _TANDEM_SOURCE
! # define _TANDEM_SOURCE
! # endif
# include <floss.h>
# define ROOT_UID 65535
#else
*** ../vim-7.2.370/src/if_cscope.c 2010-01-19 14:59:14.000000000 +0100
--- src/if_cscope.c 2010-02-24 14:10:21.000000000 +0100
***************
*** 2278,2284 ****
--- 2278,2288 ----
/* Use sigaction() to limit the waiting time to two seconds. */
sigemptyset(&sa.sa_mask);
sa.sa_handler = sig_handler;
+ # ifdef SA_NODEFER
sa.sa_flags = SA_NODEFER;
+ # else
+ sa.sa_flags = 0;
+ # endif
sigaction(SIGALRM, &sa, &old);
alarm(2); /* 2 sec timeout */
*** ../vim-7.2.370/src/osdef1.h.in 2007-02-27 16:47:59.000000000 +0100
--- src/osdef1.h.in 2010-02-24 14:20:50.000000000 +0100
***************
*** 25,31 ****
extern int fseeko __ARGS((FILE *, off_t, int));
#endif
extern long ftell __ARGS((FILE *));
! #ifdef HAVE_FTELLO
extern off_t ftello __ARGS((FILE *));
#endif
extern void rewind __ARGS((FILE *));
--- 25,31 ----
extern int fseeko __ARGS((FILE *, off_t, int));
#endif
extern long ftell __ARGS((FILE *));
! #ifdef HAVE_FSEEKO
extern off_t ftello __ARGS((FILE *));
#endif
extern void rewind __ARGS((FILE *));
*** ../vim-7.2.370/src/tag.c 2009-05-17 13:30:58.000000000 +0200
--- src/tag.c 2010-02-24 14:20:12.000000000 +0100
***************
*** 90,97 ****
/*
* We use ftello() here, if available. It returns off_t instead of long,
* which helps if long is 32 bit and off_t is 64 bit.
*/
! #ifdef HAVE_FTELLO
# define ftell ftello
#endif
--- 90,98 ----
/*
* We use ftello() here, if available. It returns off_t instead of long,
* which helps if long is 32 bit and off_t is 64 bit.
+ * We assume that when fseeko() is available then ftello() is too.
*/
! #ifdef HAVE_FSEEKO
# define ftell ftello
#endif
*** ../vim-7.2.370/src/version.c 2010-02-24 14:34:10.000000000 +0100
--- src/version.c 2010-02-24 14:45:37.000000000 +0100
***************
*** 683,684 ****
--- 683,686 ----
{ /* Add new patch number below this line */
+ /**/
+ 371,
/**/
--
A cow comes flying over the battlements, lowing aggressively. The cow
lands on GALAHAD'S PAGE, squashing him completely.
"Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\ download, build and distribute -- http://www.A-A-P.org ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
|
