Browse Source

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
maint
Junio C Hamano 4 years ago
parent
commit
43c1c79f1f
  1. 1
      cache.h
  2. 2
      git-compat-util.h

1
cache.h

@ -1960,7 +1960,6 @@ int stat_validity_check(struct stat_validity *sv, const char *path); @@ -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

2
git-compat-util.h

@ -1354,4 +1354,6 @@ static inline void *container_of_or_null_offset(void *ptr, size_t offset) @@ -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

Loading…
Cancel
Save