From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 1 Dec 2022 00:17:22 +0000 (+0900)
Subject: Merge branch 'jk/avoid-redef-system-functions-2.30'
X-Git-Tag: v2.39.3~30^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4948ed473168a36d1ca03765c599e95258a29715;p=thirdparty%2Fgit.git

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

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

4948ed473168a36d1ca03765c599e95258a29715
diff --cc git-compat-util.h
index a76d0526f7,32ed03768b..83ec7b7941
--- a/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 */
  }