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

gitster · gitster · commit 395bec6b3930 · 2022-12-05T12:16:00.000+09:00
* jk/avoid-redef-system-functions-2.30:
  git-compat-util: undefine system names before redeclaring them
diff --git a/git-compat-util.h b/git-compat-util.h
@@ -346,6 +346,7 @@ static inline int git_setitimer(int which UNUSED,
 				struct itimerval *newvalue UNUSED) {
 	return 0; /* pretend success */
 }
+#undef setitimer
 #define setitimer(which,value,ovalue) git_setitimer(which,value,ovalue)
 #endif
 
@@ -1480,6 +1481,9 @@ static inline void git_funlockfile(FILE *fh UNUSED)
 {
 	; /* nothing */
 }
+#undef flockfile
+#undef funlockfile
+#undef getc_unlocked
 #define flockfile(fh) git_flockfile(fh)
 #define funlockfile(fh) git_funlockfile(fh)
 #define getc_unlocked(fh) getc(fh)

Original file line number	Diff line number	Diff line change
`@@ -346,6 +346,7 @@ static inline int git_setitimer(int which UNUSED,`
`346`	`346`	`struct itimerval *newvalue UNUSED) {`
`347`	`347`	`return 0; /* pretend success */`
`348`	`348`	`}`
	`349`	`+#undef setitimer`
`349`	`350`	`#define setitimer(which,value,ovalue) git_setitimer(which,value,ovalue)`
`350`	`351`	`#endif`
`351`	`352`
`@@ -1480,6 +1481,9 @@ static inline void git_funlockfile(FILE *fh UNUSED)`
`1480`	`1481`	`{`
`1481`	`1482`	`; /* nothing */`
`1482`	`1483`	`}`
	`1484`	`+#undef flockfile`
	`1485`	`+#undef funlockfile`
	`1486`	`+#undef getc_unlocked`
`1483`	`1487`	`#define flockfile(fh) git_flockfile(fh)`
`1484`	`1488`	`#define funlockfile(fh) git_funlockfile(fh)`
`1485`	`1489`	`#define getc_unlocked(fh) getc(fh)`