From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 1 Dec 2022 00:14:46 +0000 (+0900)
Subject: Merge branch 'jk/avoid-redef-system-functions-2.30' into maint
X-Git-Tag: v2.40.0-rc0~141^2~1^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a61c70a7c890f48678bab8964f9f8d2173fb414a;hp=e7e5c6f715b2de7bea0d39c7d2ba887335b40aa0;p=thirdparty%2Fgit.git

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

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

diff --git a/git-compat-util.h b/git-compat-util.h
index 045b47f83a..32ed03768b 100644
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@ -338,9 +338,12 @@ struct itimerval {
 #endif
 
 #ifdef NO_SETITIMER
-static inline int setitimer(int which, const struct itimerval *value, struct itimerval *newvalue) {
+static inline int git_setitimer(int which,
+				const struct itimerval *value,
+				struct itimerval *newvalue) {
 	return 0; /* pretend success */
 }
+#define setitimer(which,value,ovalue) git_setitimer(which,value,ovalue)
 #endif
 
 #ifndef NO_LIBGEN_H
@@ -1466,14 +1469,16 @@ int open_nofollow(const char *path, int flags);
 #endif
 
 #ifndef _POSIX_THREAD_SAFE_FUNCTIONS
-static inline void flockfile(FILE *fh)
+static inline void git_flockfile(FILE *fh)
 {
 	; /* nothing */
 }
-static inline void funlockfile(FILE *fh)
+static inline void git_funlockfile(FILE *fh)
 {
 	; /* nothing */
 }
+#define flockfile(fh) git_flockfile(fh)
+#define funlockfile(fh) git_funlockfile(fh)
 #define getc_unlocked(fh) getc(fh)
 #endif