From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 19 Dec 2022 02:46:16 +0000 (+0900)
Subject: Merge branch 'jk/avoid-redef-system-functions-2.30'
X-Git-Tag: v2.40.0-rc0~142
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=efcc48efa7337cdd7e60ba19ad0e07766e5e8cd3;p=thirdparty%2Fgit.git

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

Redefining system functions for a few functions did not follow our
usual "implement git_foo() and #define foo(args) git_foo(args)"
pattern, which has broken build for some folks.

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

efcc48efa7337cdd7e60ba19ad0e07766e5e8cd3
diff --cc git-compat-util.h
index a76d0526f7,09a5f33859..76e4b11131
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@@ -341,11 -274,13 +341,13 @@@ 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 */
  }
+ #undef setitimer
+ #define setitimer(which,value,ovalue) git_setitimer(which,value,ovalue)
  #endif
  
  #ifndef NO_LIBGEN_H
@@@ -1471,11 -1316,11 +1473,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 */
  }