Ything-RepoMirrors/libgit2
2
0
Fork 0
mirror of https://github.com/libgit2/libgit2.git synced 2026-01-25 11:06:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

cmake: qsort detection in features.h

Browse Source
This commit is contained in:
Edward Thomson
2021-11-10 08:14:11 -05:00
parent d3a7a352d5
commit 19e99de054
3 changed files with 15 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/CMakeLists.txt
View File

@@ -50,22 +50,13 @@ add_feature_info(futimens GIT_USE_FUTIMENS "futimens support")
check_prototype_definition(qsort_r
"void qsort_r(void *base, size_t nmemb, size_t size, void *thunk, int (*compar)(void *, const void *, const void *))"
"" "stdlib.h" HAVE_QSORT_R_BSD)
if(HAVE_QSORT_R_BSD)
target_compile_definitions(git2internal PRIVATE HAVE_QSORT_R_BSD)
endif()
"" "stdlib.h" GIT_QSORT_R_BSD)
check_prototype_definition(qsort_r
"void qsort_r(void *base, size_t nmemb, size_t size, int (*compar)(const void *, const void *, void *), void *arg)"
"" "stdlib.h" HAVE_QSORT_R_GNU)
if(HAVE_QSORT_R_GNU)
target_compile_definitions(git2internal PRIVATE HAVE_QSORT_R_GNU)
endif()
"" "stdlib.h" GIT_QSORT_R_GNU)
check_function_exists(qsort_s HAVE_QSORT_S)
if(HAVE_QSORT_S)
target_compile_definitions(git2internal PRIVATE HAVE_QSORT_S)
endif()
check_function_exists(qsort_s GIT_QSORT_S)
# Find required dependencies

4
src/features.h.in
View File

@@ -24,6 +24,10 @@
#cmakedefine GIT_REGEX_PCRE2
#cmakedefine GIT_REGEX_BUILTIN 1
#cmakedefine GIT_QSORT_R_BSD
#cmakedefine GIT_QSORT_R_GNU
#cmakedefine GIT_QSORT_S
#cmakedefine GIT_SSH 1
#cmakedefine GIT_SSH_MEMORY_CREDENTIALS 1

16
src/util.c
View File

@@ -18,7 +18,7 @@
# endif
# include <windows.h>
# ifdef HAVE_QSORT_S
# ifdef GIT_QSORT_S
# include <search.h>
# endif
#endif
@@ -673,7 +673,7 @@ size_t git__unescape(char *str)
return (pos - str);
}
#if defined(HAVE_QSORT_S) || defined(HAVE_QSORT_R_BSD)
#if defined(GIT_QSORT_S) || defined(GIT_QSORT_R_BSD)
typedef struct {
git__sort_r_cmp cmp;
void *payload;
@@ -688,9 +688,9 @@ static int GIT_LIBGIT2_CALL git__qsort_r_glue_cmp(
#endif
#if !defined(HAVE_QSORT_R_BSD) && \
!defined(HAVE_QSORT_R_GNU) && \
!defined(HAVE_QSORT_S)
#if !defined(GIT_QSORT_R_BSD) && \
!defined(GIT_QSORT_R_GNU) && \
!defined(GIT_QSORT_S)
static void swap(uint8_t *a, uint8_t *b, size_t elsize)
{
char tmp[256];
@@ -721,12 +721,12 @@ static void insertsort(
void git__qsort_r(
void *els, size_t nel, size_t elsize, git__sort_r_cmp cmp, void *payload)
{
#if defined(HAVE_QSORT_R_BSD)
#if defined(GIT_QSORT_R_BSD)
git__qsort_r_glue glue = { cmp, payload };
qsort_r(els, nel, elsize, &glue, git__qsort_r_glue_cmp);
#elif defined(HAVE_QSORT_R_GNU)
#elif defined(GIT_QSORT_R_GNU)
qsort_r(els, nel, elsize, cmp, payload);
#elif defined(HAVE_QSORT_S)
#elif defined(GIT_QSORT_S)
git__qsort_r_glue glue = { cmp, payload };
qsort_s(els, nel, elsize, git__qsort_r_glue_cmp, &glue);
#else