luo980/curl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge def316197e into b4834a7d6d

Browse Source
This commit is contained in:
Viktor Szakats 2025-03-01 03:33:12 +01:00 committed by GitHub
commit 7d8907db31
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 25 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.github/workflows/linux.yml vendored
View File

@ -291,7 +291,11 @@ jobs:
container: 'alpine:3.20'
- name: Alpine MUSL c-ares https-rr
configure: --enable-debug --with-ssl --with-libssh2 --with-libidn2 --with-gssapi --enable-ldap --with-libpsl --disable-threaded-resolver --enable-ares --enable-httpsrr --disable-unity
configure: --enable-debug --with-ssl --with-libssh2 --with-libidn2 --with-gssapi --enable-ldap --with-libpsl --disable-threaded-resolver --enable-ares --enable-httpsrr --disable-werror
container: 'alpine:3.20'
- name: Alpine MUSL c-ares https-rr !debug
configure: --enable-debug --with-ssl --with-libssh2 --with-libidn2 --with-gssapi --enable-ldap --with-libpsl --disable-threaded-resolver --enable-ares --enable-httpsrr --disable-werror --disable-debug
container: 'alpine:3.20'
steps:

8
CMake/unix-cache.cmake
View File

@ -309,3 +309,11 @@ if(CYGWIN)
endif()
set(STDC_HEADERS 1)
set(USE_UNIX_SOCKETS 1)
if(MUSL)
set(HAVE_GLIBC_STRERROR_R 0)
set(HAVE_LINUX_TCP_H 0)
set(HAVE_POSIX_STRERROR_R 1)
set(HAVE_STROPTS_H 1)
set(HAVE_TERMIOS_H 0)
endif()

6
lib/easy_lock.h
View File

@ -45,6 +45,12 @@
#elif defined(HAVE_ATOMIC) && defined(HAVE_STDATOMIC_H)
#include <stdatomic.h>
#if defined(HAVE_SCHED_YIELD)
/* Hack for Unity mode. Avoid macro collisions with MUSL 1.25 and older */
#ifdef HEADER_CURL_MEMDEBUG_H
#undef HEADER_CURL_MEMDEBUG_H
#undef calloc
#undef free
#endif
#include <sched.h>
#endif

6
lib/memdebug.h
View File

@ -33,6 +33,11 @@
#include <curl/curl.h>
#include "functypes.h"
/* Avoid double definitions/declarations, in case we include this header
again after a 'memdebug_reset.h'. */
#ifndef HEADER_CURL_MEMDEBUG_H_DECL
#define HEADER_CURL_MEMDEBUG_H_DECL
#if defined(__GNUC__) && __GNUC__ >= 3
# define ALLOC_FUNC __attribute__((__malloc__))
# define ALLOC_SIZE(s) __attribute__((__alloc_size__(s)))
@ -108,6 +113,7 @@ CURL_EXTERN ALLOC_FUNC FILE *curl_dbg_fdopen(int filedes, const char *mode,
int line, const char *source);
CURL_EXTERN int curl_dbg_fclose(FILE *file, int line, const char *source);
#endif /* HEADER_CURL_MEMDEBUG_H_DECL */
#ifndef MEMDEBUG_NODEFINES