mirror of
https://git.proxmox.com/git/libgit2
synced 2025-08-07 15:37:46 +00:00
Merge pull request #2026 from libgit2/rb/fix-strnlen-on-old-macos
Use our strnlen on MacOS for backward compat
This commit is contained in:
commit
5f5e44652e
@ -89,13 +89,17 @@ extern struct tm * p_gmtime_r (const time_t *timer, struct tm *result);
|
|||||||
# include "unix/posix.h"
|
# include "unix/posix.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined(__MINGW32__) || defined(__sun)
|
#if defined(__MINGW32__) || defined(__sun) || defined(__APPLE__)
|
||||||
|
# define NO_STRNLEN
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef NO_STRNLEN
|
||||||
GIT_INLINE(size_t) p_strnlen(const char *s, size_t maxlen) {
|
GIT_INLINE(size_t) p_strnlen(const char *s, size_t maxlen) {
|
||||||
const char *end = memchr(s, 0, maxlen);
|
const char *end = memchr(s, 0, maxlen);
|
||||||
return end ? (size_t)(end - s) : maxlen;
|
return end ? (size_t)(end - s) : maxlen;
|
||||||
}
|
}
|
||||||
#else
|
#else
|
||||||
# define p_strnlen strnlen
|
# define p_strnlen strnlen
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef NO_READDIR_R
|
#ifdef NO_READDIR_R
|
||||||
|
Loading…
Reference in New Issue
Block a user