external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-03-09 15:49:59 +00:00
Code Issues Releases Wiki Activity

Merge develop

Browse source
This commit is contained in:
winlin 2020-04-27 14:01:33 +08:00
commit 0b62ca02b7
5 changed files with 231 additions and 175 deletions
Download patch file Download diff file Expand all files Collapse all files

4
trunk/3rdparty/st-srs/Makefile vendored
View file

@ -189,10 +189,6 @@ OTHER_FLAGS = -Wall
ifeq ($(shell test -f /usr/include/sys/epoll.h && echo yes), yes)
DEFINES += -DMD_HAVE_EPOLL
endif
# For SRS, sendmmsg
ifeq ($(shell grep -qs sendmmsg /usr/include/sys/socket.h && echo yes), yes)
DEFINES += -DMD_HAVE_SENDMMSG -D_GNU_SOURCE
endif
endif
ifeq ($(OS), NETBSD)

2
trunk/3rdparty/st-srs/io.c vendored
View file

@ -743,7 +743,7 @@ int st_sendmsg(_st_netfd_t *fd, const struct msghdr *msg, int flags, st_utime_t
}
#if defined(MD_HAVE_SENDMMSG) && defined(_GNU_SOURCE)
#if defined(MD_HAVE_SENDMMSG) && defined(__linux__) && defined(_GNU_SOURCE)
int st_sendmmsg(st_netfd_t fd, struct mmsghdr *msgvec, unsigned int vlen, int flags, st_utime_t timeout)
{
int n;

2
trunk/3rdparty/st-srs/public.h vendored
View file

@ -151,7 +151,9 @@ extern int st_recvfrom(st_netfd_t fd, void *buf, int len, struct sockaddr *from,
extern int st_sendto(st_netfd_t fd, const void *msg, int len, const struct sockaddr *to, int tolen, st_utime_t timeout);
extern int st_recvmsg(st_netfd_t fd, struct msghdr *msg, int flags, st_utime_t timeout);
extern int st_sendmsg(st_netfd_t fd, const struct msghdr *msg, int flags, st_utime_t timeout);
#if defined(__linux__) && defined(_GNU_SOURCE)
extern int st_sendmmsg(st_netfd_t fd, struct mmsghdr *msgvec, unsigned int vlen, int flags, st_utime_t timeout);
#endif
extern st_netfd_t st_open(const char *path, int oflags, mode_t mode);
#ifdef DEBUG