Mercurial > vim

diff src/misc2.c @ 10449:222b1432814e v8.0.0118

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
commit https://github.com/vim/vim/commit/5162822914372fc916a93f85848c0c82209e7cec Author: Bram Moolenaar <Bram@vim.org> Date: Thu Dec 1 23:03:28 2016 +0100 patch 8.0.0118 Problem: "make proto" adds extra function prototype. Solution: Add #ifdef.
author Christian Brabandt <cb@256bit.org>
date Thu, 01 Dec 2016 23:15:04 +0100
parents 37a441352da2
children 055b1633aed7
line wrap: on
line diff
--- a/src/misc2.c
+++ b/src/misc2.c
@@ -6243,7 +6243,8 @@ parse_queued_messages(void)
 }
 #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 @@ elapsed(struct timeval *start_tv)
     return (now_tv.tv_sec - start_tv->tv_sec) * 1000L
 	 + (now_tv.tv_usec - start_tv->tv_usec) / 1000L;
 }
-#endif
-
-#ifdef ELAPSED_TICKCOUNT
+# endif
+
+# ifdef ELAPSED_TICKCOUNT
 /*
  * Return time in msec since "start_tick".
  */
@@ -6269,4 +6270,5 @@ elapsed(DWORD start_tick)
 
     return (long)now - (long)start_tick;
 }
-#endif
+# endif
+#endif