Merge branch 'jk/avoid-redef-system-functions-2.30' into jk/avoid-redef-system-functions

* jk/avoid-redef-system-functions-2.30:
  git-compat-util: undefine system names before redeclaring them

diff --cc git-compat-util.h
index 83ec7b7941e653a67efc0e2ccfeaedd6a839b076,09a5f338594a85b98d833d19e06da826245da736..76e4b111315339449cd48d17f735f727935c08d8
--- 1/git-compat-util.h
--- 2/git-compat-util.h
+++ b/git-compat-util.h
@@@ -341,11 -274,12 +341,12 @@@ struct itimerval 
  #endif
  
  #ifdef NO_SETITIMER
 -static inline int git_setitimer(int which,
 -                              const struct itimerval *value,
 -                              struct itimerval *newvalue) {
 +static inline int git_setitimer(int which UNUSED,
 +                              const struct itimerval *value UNUSED,
 +                              struct itimerval *newvalue UNUSED) {
        return 0; /* pretend success */
  }
+ #undef setitimer
  #define setitimer(which,value,ovalue) git_setitimer(which,value,ovalue)
  #endif