undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
* jk/avoid-redef-system-functions-2.30:
  git-compat-util: avoid redefining system function names
This commit is contained in:
Junio C Hamano 2022-12-01 09:14:46 +09:00
commit a61c70a7c8
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
git-compat-util.h
View File

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