eyecatchu/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-01-20 22:07:19 +09:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
* jk/avoid-redef-system-functions-2.30:
  git-compat-util: undefine system names before redeclaring them
This commit is contained in:
Junio C Hamano 2022-12-05 12:16:00 +09:00
commit 395bec6b39
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
git-compat-util.h
View File

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