summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--git-compat-util.h11
1 files changed, 8 insertions, 3 deletions
diff --git a/git-compat-util.h b/git-compat-util.h
index 045b47f83a..32ed03768b 100644
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@ -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