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

* jk/avoid-redef-system-functions-2.30
  git-compat-util: avoid redefining system function names

diff --cc git-compat-util.h
index a76d0526f79266e1dc512072a4236876df8f8726,32ed03768b5b2d5c9228fca48c9ac7400bdf8324..83ec7b7941e653a67efc0e2ccfeaedd6a839b076
--- 1/git-compat-util.h
--- 2/git-compat-util.h
+++ b/git-compat-util.h
@@@ -341,11 -338,12 +341,12 @@@ struct itimerval 
  #endif
  
  #ifdef NO_SETITIMER
- static inline int setitimer(int which UNUSED,
-                           const struct itimerval *value UNUSED,
-                           struct itimerval *newvalue UNUSED) {
 -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 */
  }
+ #define setitimer(which,value,ovalue) git_setitimer(which,value,ovalue)
  #endif
  
  #ifndef NO_LIBGEN_H
@@@ -1471,11 -1469,11 +1472,11 @@@ int open_nofollow(const char *path, in
  #endif
  
  #ifndef _POSIX_THREAD_SAFE_FUNCTIONS
- static inline void flockfile(FILE *fh UNUSED)
 -static inline void git_flockfile(FILE *fh)
++static inline void git_flockfile(FILE *fh UNUSED)
  {
        ; /* nothing */
  }
- static inline void funlockfile(FILE *fh UNUSED)
 -static inline void git_funlockfile(FILE *fh)
++static inline void git_funlockfile(FILE *fh UNUSED)
  {
        ; /* nothing */
  }