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

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
---

395bec6b3930ce3e23ef90bfb01be4922b21259e
diff --cc git-compat-util.h
index 83ec7b7941,09a5f33859..76e4b11131
--- a/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