patch 9.1.1706: MS-Windows: Compile error when building with if_ruby

64-bitman · chrisbra · commit 2635e83d46d5 · 2025-08-27T23:53:41.000+02:00
Problem: MS-Windows: Compile error when building with if_ruby (Christian Robinson, after v9.1.1704) Solution: Do not define gettimeofday() if ruby interface is compiled in (Foxe Chen). fixes: #18143 closes: #18144 Signed-off-by: Foxe Chen <chen.foxe@gmail.com> Signed-off-by: Christian Brabandt <cb@256bit.org>
diff --git a/src/proto/time.pro b/src/proto/time.pro
@@ -20,7 +20,7 @@ void f_timer_pause(typval_T *argvars, typval_T *rettv);
 void f_timer_start(typval_T *argvars, typval_T *rettv);
 void f_timer_stop(typval_T *argvars, typval_T *rettv);
 void f_timer_stopall(typval_T *argvars, typval_T *rettv);
-#if defined(MSWIN) || defined(__MINGW32__)
+#if (defined(MSWIN) || defined(__MINGW32__)) && !defined(FEAT_RUBY)
 int gettimeofday(struct timeval *tv, char *dummy);
 #endif
 void time_push(void *tv_rel, void *tv_start);
diff --git a/src/time.c b/src/time.c
@@ -127,7 +127,8 @@ get_ctime(time_t thetime, int add_newline)
     return buf;
 }
 
-#if defined(MSWIN) || defined(__MINGW32__)
+// Ruby has its own version of gettimeofday
+#if (defined(MSWIN) || defined(__MINGW32__)) && !defined(FEAT_RUBY)
 /*
  * Windows doesn't have gettimeofday(), although it does have struct timeval.
  */
diff --git a/src/version.c b/src/version.c
@@ -724,6 +724,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1706,
 /**/
     1705,
 /**/

Original file line number	Diff line number	Diff line change
`@@ -127,7 +127,8 @@ get_ctime(time_t thetime, int add_newline)`
`127`	`127`	`return buf;`
`128`	`128`	`}`
`129`	`129`
`130`		`-#if defined(MSWIN) \|\| defined(__MINGW32__)`
	`130`	`+// Ruby has its own version of gettimeofday`
	`131`	`+#if (defined(MSWIN) \|\| defined(__MINGW32__)) && !defined(FEAT_RUBY)`
`131`	`132`	`/*`
`132`	`133`	`* Windows doesn't have gettimeofday(), although it does have struct timeval.`
`133`	`134`	`*/`