• R/O
  • SSH

vim: Commit

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


Commit MetaInfo

Révisioncb7df44afe7ef6a52bbaebf878e1d2ecd10ecc30 (tree)
l'heure2020-11-25 20:00:04
AuteurBram Moolenaar <Bram@vim....>
CommiterBram 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

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 @@
67076707 {
67086708 int idx;
67096709 synpat_T *spp;
6710-# ifdef FEAT_FLOAT
6710+# if defined(FEAT_RELTIME) && defined(FEAT_FLOAT)
67116711 proftime_T tm;
67126712 # endif
67136713 int len;
@@ -6737,7 +6737,7 @@
67376737 p->match = spp->sp_time.match;
67386738 total_count += spp->sp_time.count;
67396739 p->slowest = spp->sp_time.slowest;
6740-# ifdef FEAT_FLOAT
6740+# if defined(FEAT_RELTIME) && defined(FEAT_FLOAT)
67416741 profile_divide(&spp->sp_time.total, spp->sp_time.count, &tm);
67426742 p->average = tm;
67436743 # 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 @@
751751 static int included_patches[] =
752752 { /* Add new patch number below this line */
753753 /**/
754+ 2042,
755+/**/
754756 2041,
755757 /**/
756758 2040,
Afficher sur ancien navigateur de dépôt.