aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-23 03:43:49 -04:00
Code Activity

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

Browse Source 
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>
This commit is contained in:
Foxe Chen
2025-08-27 23:53:41 +02:00
committed by Christian Brabandt
parent 6931730433
commit 2635e83d46
3 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/proto/time.pro
View File

@@ -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_start(typval_T *argvars, typval_T *rettv);
void f_timer_stop(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); 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); int gettimeofday(struct timeval *tv, char *dummy);
#endif #endif
void time_push(void *tv_rel, void *tv_start); void time_push(void *tv_rel, void *tv_start);

3
src/time.c
View File

@@ -127,7 +127,8 @@ get_ctime(time_t thetime, int add_newline)
return buf; 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. * Windows doesn't have gettimeofday(), although it does have struct timeval.
*/ */

2
src/version.c
View File

@@ -724,6 +724,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1706,
/**/ /**/
1705, 1705,
/**/ /**/