diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2020-11-30 14:49:44 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-11-30 14:49:44 -0800 |
| commit | 43c1c79f1f745c22a47f7263530ba5251f957f41 (patch) | |
| tree | 70f4bf4fc074f900da97b4ecdfc18a1713a950cb | |
| parent | Merge branch 'js/t3404-master-to-primary' (diff) | |
| parent | move sleep_millisec to git-compat-util.h (diff) | |
| download | tgif-43c1c79f1f745c22a47f7263530ba5251f957f41.tar.xz | |
Merge branch 'hn/sleep-millisec-decl'
Move a definition of compatibility wrapper from cache.h to
git-compat-util.h
* hn/sleep-millisec-decl:
move sleep_millisec to git-compat-util.h
| -rw-r--r-- | cache.h | 1 | ||||
| -rw-r--r-- | git-compat-util.h | 2 |
2 files changed, 2 insertions, 1 deletions
@@ -1960,7 +1960,6 @@ int stat_validity_check(struct stat_validity *sv, const char *path); void stat_validity_update(struct stat_validity *sv, int fd); int versioncmp(const char *s1, const char *s2); -void sleep_millisec(int millisec); /* * Create a directory and (if share is nonzero) adjust its permissions diff --git a/git-compat-util.h b/git-compat-util.h index adfea06897..7d509c5022 100644 --- a/git-compat-util.h +++ b/git-compat-util.h @@ -1354,4 +1354,6 @@ static inline void *container_of_or_null_offset(void *ptr, size_t offset) ((uintptr_t)&(ptr)->member - (uintptr_t)(ptr)) #endif /* !__GNUC__ */ +void sleep_millisec(int millisec); + #endif |