patch 8.0.0118
Problem: "make proto" adds extra function prototype.
Solution: Add #ifdef.
diff --git a/src/misc2.c b/src/misc2.c
index baa614d..afafee1 100644
--- a/src/misc2.c
+++ b/src/misc2.c
@@ -6243,7 +6243,8 @@
}
#endif
-#ifdef ELAPSED_TIMEVAL /* no PROTO here, proto is defined in vim.h */
+#ifndef PROTO /* proto is defined in vim.h */
+# ifdef ELAPSED_TIMEVAL
/*
* Return time in msec since "start_tv".
*/
@@ -6256,9 +6257,9 @@
return (now_tv.tv_sec - start_tv->tv_sec) * 1000L
+ (now_tv.tv_usec - start_tv->tv_usec) / 1000L;
}
-#endif
+# endif
-#ifdef ELAPSED_TICKCOUNT
+# ifdef ELAPSED_TICKCOUNT
/*
* Return time in msec since "start_tick".
*/
@@ -6269,4 +6270,5 @@
return (long)now - (long)start_tick;
}
+# endif
#endif
diff --git a/src/version.c b/src/version.c
index 6bc108f..cf91feb 100644
--- a/src/version.c
+++ b/src/version.c
@@ -765,6 +765,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 118,
+/**/
117,
/**/
116,