git-compat-util: undefine system names before redeclaring them

When we define a macro to point a system function (e.g., flockfile) to our custom wrapper, we should make sure that the system did not already define it as a macro. This is rarely a problem, but can cause compilation failures if both of these are true: - we decide to define our own wrapper even though the system provides the function; we know this happens at least with uclibc, which may declare flockfile, etc, without _POSIX_THREAD_SAFE_FUNCTIONS - the system version is declared as a macro; we know this happens at least with uclibc's version of getc_unlocked() So just handling getc_unlocked() would be sufficient to deal with the real-world case we've seen. But since it's easy to do, we may as well be defensive about the other macro wrappers added in the previous patch. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Jeff King committed Dec 2, 2022 at 06:05 UTC e1a95b78d8a26762ea04332de8b7c3878da51522
1 file changed +4
git-compat-util.h
+4
@@ -279,6 +279,7 @@ static inline int git_setitimer(int which,
279 struct itimerval *newvalue) {
280 return 0; /* pretend success */
281 }
282 +#undef setitimer
283 #define setitimer(which,value,ovalue) git_setitimer(which,value,ovalue)
284 #endif
285
@@ -1323,6 +1324,9 @@ static inline void git_funlockfile(FILE *fh)
1324 {
1325 ; /* nothing */
1326 }
1327 +#undef flockfile
1328 +#undef funlockfile
1329 +#undef getc_unlocked
1330 #define flockfile(fh) git_flockfile(fh)
1331 #define funlockfile(fh) git_funlockfile(fh)
1332 #define getc_unlocked(fh) getc(fh)