OSDN > Trouver un logiciel > Vim > SCM > hg > vim > Commit

Vim
Fork

vim: Commit

Mirror of the Vim source from https://github.com/vim/vim

Commit MetaInfo

Révision	cb7df44afe7ef6a52bbaebf878e1d2ecd10ecc30 (tree)
l'heure	2020-11-25 20:00:04
Auteur	Bram Moolenaar <Bram@vim....>
Commiter	Bram Moolenaar

Message de Log

patch 8.2.2042: build failure with +profile but without +reltime

Commit: https://github.com/vim/vim/commit/813196784ad2a3a8cd65be5e975769d9768a728e
Author: Bram Moolenaar <Bram@vim.org>
Date: Wed Nov 25 11:47:39 2020 +0100

patch 8.2.2042: build failure with +profile but without +reltime

Problem: Build failure with +profile but without +reltime.
Solution: Adjust #ifdef. (Christian Brabandt, closes https://github.com/vim/vim/issues/7361)

Change Summary

modified: src/syntax.c (diff)
modified: src/version.c (diff)

Modification

diff -r d46d4c6dde13 -r cb7df44afe7e src/syntax.c

--- a/src/syntax.c Tue Nov 24 20:15:04 2020 +0100

+++ b/src/syntax.c Wed Nov 25 12:00:04 2020 +0100

		@@ -6707,7 +6707,7 @@
6707	6707	{
6708	6708	int idx;
6709	6709	synpat_T *spp;
6710		-# ifdef FEAT_FLOAT
	6710	+# if defined(FEAT_RELTIME) && defined(FEAT_FLOAT)
6711	6711	proftime_T tm;
6712	6712	# endif
6713	6713	int len;

		@@ -6737,7 +6737,7 @@
6737	6737	p->match = spp->sp_time.match;
6738	6738	total_count += spp->sp_time.count;
6739	6739	p->slowest = spp->sp_time.slowest;
6740		-# ifdef FEAT_FLOAT
	6740	+# if defined(FEAT_RELTIME) && defined(FEAT_FLOAT)
6741	6741	profile_divide(&spp->sp_time.total, spp->sp_time.count, &tm);
6742	6742	p->average = tm;
6743	6743	# endif

diff -r d46d4c6dde13 -r cb7df44afe7e src/version.c

--- a/src/version.c Tue Nov 24 20:15:04 2020 +0100

+++ b/src/version.c Wed Nov 25 12:00:04 2020 +0100

		@@ -751,6 +751,8 @@
751	751	static int included_patches[] =
752	752	{ /* Add new patch number below this line */
753	753	/**/
	754	+ 2042,
	755	+/**/
754	756	2041,
755	757	/**/
756	758	2040,

Afficher sur ancien navigateur de dépôt.