[packages/vim.git] / 7.2.371

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    ///
Commit	Line	Data
8587d00a AM	1	To: vim-dev@vim.org
	2	Subject: Patch 7.2.371
	3	Fcc: outbox
	4	From: Bram Moolenaar <Bram@moolenaar.net>
	5	Mime-Version: 1.0
	6	Content-Type: text/plain; charset=UTF-8
	7	Content-Transfer-Encoding: 8bit
	8	------------
	9
	10	Patch 7.2.371
	11	Problem: Build problems on Tandem NonStop.
	12	Solution: A few changes to #ifdefs (Joachim Schmitz)
	13	Files: src/auto/configure, src/configure.in, src/config.h.in, src/vim.h,
	14	src/if_cscope.c, src/osdef1.h.in, src/tag.c
	15
	16
	17	*** ../vim-7.2.370/src/auto/configure 2010-02-17 16:23:03.000000000 +0100
	18	--- src/auto/configure 2010-02-24 14:27:00.000000000 +0100
	19	***************
	20	* 14038,14046 **
	21
	22
	23
	24	!
	25	!
	26	! for ac_func in bcmp fchdir fchown fseeko fsync ftello getcwd getpseudotty \
	27	getpwnam getpwuid getrlimit gettimeofday getwd lstat memcmp \
	28	memset mkdtemp nanosleep opendir putenv qsort readlink select setenv \
	29	setpgid setsid sigaltstack sigstack sigset sigsetjmp sigaction \
	30	--- 14038,14044 ----
	31
	32
	33
	34	! for ac_func in bcmp fchdir fchown fsync getcwd getpseudotty \
	35	getpwnam getpwuid getrlimit gettimeofday getwd lstat memcmp \
	36	memset mkdtemp nanosleep opendir putenv qsort readlink select setenv \
	37	setpgid setsid sigaltstack sigstack sigset sigsetjmp sigaction \
	38	***************
	39	* 14146,14151 **
	40	--- 14144,14281 ----
	41	fi
	42	done
	43
	44	+ { $as_echo "$as_me:$LINENO: checking for _LARGEFILE_SOURCE value needed for large files" >&5
	45	+ $as_echo_n "checking for _LARGEFILE_SOURCE value needed for large files... " >&6; }
	46	+ if test "${ac_cv_sys_largefile_source+set}" = set; then
	47	+ $as_echo_n "(cached) " >&6
	48	+ else
	49	+ while :; do
	50	+ cat >conftest.$ac_ext <<_ACEOF
	51	+ /* confdefs.h. */
	52	+ _ACEOF
	53	+ cat confdefs.h >>conftest.$ac_ext
	54	+ cat >>conftest.$ac_ext <<_ACEOF
	55	+ /* end confdefs.h. */
	56	+ #include <sys/types.h> /* for off_t */
	57	+ #include <stdio.h>
	58	+ int
	59	+ main ()
	60	+ {
	61	+ int (fp) (FILE , off_t, int) = fseeko;
	62	+ return fseeko (stdin, 0, 0) && fp (stdin, 0, 0);
	63	+ ;
	64	+ return 0;
65	+ }
66	+ _ACEOF
67	+ rm -f conftest.$ac_objext conftest$ac_exeext
68	+ if { (ac_try="$ac_link"
69	+ case "(($ac_try" in
70	+ \" \| \` \| \\) ac_try_echo=\$ac_try;;
71	+ *) ac_try_echo=$ac_try;;
72	+ esac
73	+ eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
74	+ $as_echo "$ac_try_echo") >&5
75	+ (eval "$ac_link") 2>conftest.er1
76	+ ac_status=$?
77	+ grep -v '^ *+' conftest.er1 >conftest.err
78	+ rm -f conftest.er1
79	+ cat conftest.err >&5
80	+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
81	+ (exit $ac_status); } && {
82	+ test -z "$ac_c_werror_flag" \|\|
83	+ test ! -s conftest.err
84	+ } && test -s conftest$ac_exeext && {
85	+ test "$cross_compiling" = yes \|\|
86	+ $as_test_x conftest$ac_exeext
87	+ }; then
88	+ ac_cv_sys_largefile_source=no; break
89	+ else
90	+ $as_echo "$as_me: failed program was:" >&5
91	+ sed 's/^/\| /' conftest.$ac_ext >&5
92	+
93	+
94	+ fi
95	+
96	+ rm -rf conftest.dSYM
97	+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
98	+ conftest$ac_exeext conftest.$ac_ext
99	+ cat >conftest.$ac_ext <<_ACEOF
100	+ /* confdefs.h. */
101	+ _ACEOF
102	+ cat confdefs.h >>conftest.$ac_ext
103	+ cat >>conftest.$ac_ext <<_ACEOF
104	+ /* end confdefs.h. */
105	+ #define _LARGEFILE_SOURCE 1
106	+ #include <sys/types.h> /* for off_t */
107	+ #include <stdio.h>
108	+ int
109	+ main ()
110	+ {
111	+ int (fp) (FILE , off_t, int) = fseeko;
112	+ return fseeko (stdin, 0, 0) && fp (stdin, 0, 0);
113	+ ;
114	+ return 0;
115	+ }
116	+ _ACEOF
117	+ rm -f conftest.$ac_objext conftest$ac_exeext
118	+ if { (ac_try="$ac_link"
119	+ case "(($ac_try" in
120	+ \" \| \` \| \\) ac_try_echo=\$ac_try;;
121	+ *) ac_try_echo=$ac_try;;
122	+ esac
123	+ eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
124	+ $as_echo "$ac_try_echo") >&5
125	+ (eval "$ac_link") 2>conftest.er1
126	+ ac_status=$?
127	+ grep -v '^ *+' conftest.er1 >conftest.err
128	+ rm -f conftest.er1
129	+ cat conftest.err >&5
130	+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
131	+ (exit $ac_status); } && {
132	+ test -z "$ac_c_werror_flag" \|\|
133	+ test ! -s conftest.err
134	+ } && test -s conftest$ac_exeext && {
135	+ test "$cross_compiling" = yes \|\|
136	+ $as_test_x conftest$ac_exeext
137	+ }; then
138	+ ac_cv_sys_largefile_source=1; break
139	+ else
140	+ $as_echo "$as_me: failed program was:" >&5
141	+ sed 's/^/\| /' conftest.$ac_ext >&5
142	+
143	+
144	+ fi
145	+
146	+ rm -rf conftest.dSYM
147	+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
148	+ conftest$ac_exeext conftest.$ac_ext
149	+ ac_cv_sys_largefile_source=unknown
150	+ break
151	+ done
152	+ fi
153	+ { $as_echo "$as_me:$LINENO: result: $ac_cv_sys_largefile_source" >&5
154	+ $as_echo "$ac_cv_sys_largefile_source" >&6; }
155	+ case $ac_cv_sys_largefile_source in #(
156	+ no \| unknown) ;;
157	+ *)
158	+ cat >>confdefs.h <<_ACEOF
159	+ #define _LARGEFILE_SOURCE $ac_cv_sys_largefile_source
160	+ _ACEOF
161	+ ;;
162	+ esac
163	+ rm -rf conftest*
164	+
165	+ # We used to try defining _XOPEN_SOURCE=500 too, to work around a bug
166	+ # in glibc 2.1.3, but that breaks too many other things.
167	+ # If you want fseeko and ftello with glibc, upgrade to a fixed glibc.
168	+ if test $ac_cv_sys_largefile_source != unknown; then
169	+
170	+ cat >>confdefs.h <<\_ACEOF
171	+ #define HAVE_FSEEKO 1
172	+ _ACEOF
173	+
174	+ fi
175	+
176
177	{ $as_echo "$as_me:$LINENO: checking for st_blksize" >&5
178	$as_echo_n "checking for st_blksize... " >&6; }
179	*** ../vim-7.2.370/src/configure.in 2010-02-17 16:23:03.000000000 +0100
180	--- src/configure.in 2010-02-24 14:18:49.000000000 +0100
181	***************
182	* 2642,2655 **
183	AC_DEFINE(BAD_GETCWD)
184	fi
185
186	! dnl Check for functions in one big call, to reduce the size of configure
187	! AC_CHECK_FUNCS(bcmp fchdir fchown fseeko fsync ftello getcwd getpseudotty \
188	getpwnam getpwuid getrlimit gettimeofday getwd lstat memcmp \
189	memset mkdtemp nanosleep opendir putenv qsort readlink select setenv \
190	setpgid setsid sigaltstack sigstack sigset sigsetjmp sigaction \
191	sigvec strcasecmp strerror strftime stricmp strncasecmp \
192	strnicmp strpbrk strtol tgetent towlower towupper iswupper \
193	usleep utime utimes)
194
195	dnl fstatfs() can take 2 to 4 arguments, try to use st_blksize if possible
196	AC_MSG_CHECKING(for st_blksize)
197	--- 2642,2657 ----
198	AC_DEFINE(BAD_GETCWD)
199	fi
200
201	! dnl Check for functions in one big call, to reduce the size of configure.
202	! dnl Can only be used for functions that do not require any include.
203	! AC_CHECK_FUNCS(bcmp fchdir fchown fsync getcwd getpseudotty \
204	getpwnam getpwuid getrlimit gettimeofday getwd lstat memcmp \
205	memset mkdtemp nanosleep opendir putenv qsort readlink select setenv \
206	setpgid setsid sigaltstack sigstack sigset sigsetjmp sigaction \
207	sigvec strcasecmp strerror strftime stricmp strncasecmp \
208	strnicmp strpbrk strtol tgetent towlower towupper iswupper \
209	usleep utime utimes)
210	+ AC_FUNC_FSEEKO
211
212	dnl fstatfs() can take 2 to 4 arguments, try to use st_blksize if possible
213	AC_MSG_CHECKING(for st_blksize)
214	*** ../vim-7.2.370/src/config.h.in 2009-11-17 17:13:03.000000000 +0100
215	--- src/config.h.in 2010-02-24 14:20:26.000000000 +0100
216	***************
217	* 144,150 **
218	#undef HAVE_FCHOWN
219	#undef HAVE_FSEEKO
220	#undef HAVE_FSYNC
221	- #undef HAVE_FTELLO
222	#undef HAVE_GETCWD
223	#undef HAVE_GETPSEUDOTTY
224	#undef HAVE_GETPWNAM
225	--- 144,149 ----
226	*** ../vim-7.2.370/src/vim.h 2010-02-03 15:14:15.000000000 +0100
227	--- src/vim.h 2010-02-24 14:08:14.000000000 +0100
228	***************
229	* 52,58 **
230
231	/* user ID of root is usually zero, but not for everybody */
232	#ifdef __TANDEM
233	! # define _TANDEM_SOURCE
234	# include <floss.h>
235	# define ROOT_UID 65535
236	#else
237	--- 52,60 ----
238
239	/* user ID of root is usually zero, but not for everybody */
240	#ifdef __TANDEM
241	! # ifndef _TANDEM_SOURCE
242	! # define _TANDEM_SOURCE
243	! # endif
244	# include <floss.h>
245	# define ROOT_UID 65535
246	#else
247	*** ../vim-7.2.370/src/if_cscope.c 2010-01-19 14:59:14.000000000 +0100
248	--- src/if_cscope.c 2010-02-24 14:10:21.000000000 +0100
249	***************
250	* 2278,2284 **
251	--- 2278,2288 ----
252	/* Use sigaction() to limit the waiting time to two seconds. */
253	sigemptyset(&sa.sa_mask);
254	sa.sa_handler = sig_handler;
255	+ # ifdef SA_NODEFER
256	sa.sa_flags = SA_NODEFER;
257	+ # else
258	+ sa.sa_flags = 0;
259	+ # endif
260	sigaction(SIGALRM, &sa, &old);
261	alarm(2); /* 2 sec timeout */
262
263	*** ../vim-7.2.370/src/osdef1.h.in 2007-02-27 16:47:59.000000000 +0100
264	--- src/osdef1.h.in 2010-02-24 14:20:50.000000000 +0100
265	***************
266	* 25,31 **
267	extern int fseeko __ARGS((FILE *, off_t, int));
268	#endif
269	extern long ftell __ARGS((FILE *));
270	! #ifdef HAVE_FTELLO
271	extern off_t ftello __ARGS((FILE *));
272	#endif
273	extern void rewind __ARGS((FILE *));
274	--- 25,31 ----
275	extern int fseeko __ARGS((FILE *, off_t, int));
276	#endif
277	extern long ftell __ARGS((FILE *));
278	! #ifdef HAVE_FSEEKO
279	extern off_t ftello __ARGS((FILE *));
280	#endif
281	extern void rewind __ARGS((FILE *));
282	*** ../vim-7.2.370/src/tag.c 2009-05-17 13:30:58.000000000 +0200
283	--- src/tag.c 2010-02-24 14:20:12.000000000 +0100
284	***************
285	* 90,97 **
286	/*
287	* We use ftello() here, if available. It returns off_t instead of long,
288	* which helps if long is 32 bit and off_t is 64 bit.
289	*/
290	! #ifdef HAVE_FTELLO
291	# define ftell ftello
292	#endif
293
294	--- 90,98 ----
295	/*
296	* We use ftello() here, if available. It returns off_t instead of long,
297	* which helps if long is 32 bit and off_t is 64 bit.
298	+ * We assume that when fseeko() is available then ftello() is too.
299	*/
300	! #ifdef HAVE_FSEEKO
301	# define ftell ftello
302	#endif
303
304	*** ../vim-7.2.370/src/version.c 2010-02-24 14:34:10.000000000 +0100
305	--- src/version.c 2010-02-24 14:45:37.000000000 +0100
306	***************
307	* 683,684 **
308	--- 683,686 ----
309	{ /* Add new patch number below this line */
310	+ /**/
311	+ 371,
312	/**/
313
314	--
315	A cow comes flying over the battlements, lowing aggressively. The cow
316	lands on GALAHAD'S PAGE, squashing him completely.
317	"Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD
318
319	/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
320	/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
321	\\\ download, build and distribute -- http://www.A-A-P.org ///
322	\\\ help me help AIDS victims -- http://ICCF-Holland.org ///