Merge branch 'jc/compat-util-setitimer-fix'

Fix a recent bug in a rarely used replacement code.

* jc/compat-util-setitimer-fix:
  compat-util: pretend that stub setitimer() always succeeds

diff --combined git-compat-util.h
index 7d509c50224dd5de52d18f8004e2636cd75423e4,421c90b5d85c84db167576ae2d9541b8dddc8d05..104993b97550c8df8f3834929e945dee43af2742
--- 1/git-compat-util.h
--- 2/git-compat-util.h
+++ b/git-compat-util.h
@@@ -273,7 -273,7 +273,7 @@@ struct itimerval 
  
  #ifdef NO_SETITIMER
  static inline int setitimer(int which, const struct itimerval *value, struct itimerval *newvalue) {
-       ; /* nothing */
+       return 0; /* pretend success */
  }
  #endif
  
@@@ -489,13 -489,11 +489,13 @@@ static inline int const_error(void
  #define error_errno(...) (error_errno(__VA_ARGS__), const_error())
  #endif
  
 -void set_die_routine(NORETURN_PTR void (*routine)(const char *err, va_list params));
 -void set_error_routine(void (*routine)(const char *err, va_list params));
 -extern void (*get_error_routine(void))(const char *err, va_list params);
 -void set_warn_routine(void (*routine)(const char *warn, va_list params));
 -extern void (*get_warn_routine(void))(const char *warn, va_list params);
 +typedef void (*report_fn)(const char *, va_list params);
 +
 +void set_die_routine(NORETURN_PTR report_fn routine);
 +void set_error_routine(report_fn routine);
 +report_fn get_error_routine(void);
 +void set_warn_routine(report_fn routine);
 +report_fn get_warn_routine(void);
  void set_die_is_recursing_routine(int (*routine)(void));
  
  int starts_with(const char *str, const char *prefix);
@@@ -1354,6 -1352,4 +1354,6 @@@ static inline void *container_of_or_nul
        ((uintptr_t)&(ptr)->member - (uintptr_t)(ptr))
  #endif /* !__GNUC__ */
  
 +void sleep_millisec(int millisec);
 +
  #endif