mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-25 06:59:52 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

update master

Browse source
This commit is contained in:
Chengyi Zhao 2024-06-25 16:53:15 +08:00
commit 7138fa0272
227 changed files with 67492 additions and 3107 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/pulsecore/socket-util.c
View file

@ -50,9 +50,6 @@
#ifdef HAVE_NETDB_H
#include <netdb.h>
#endif
#ifdef HAVE_SYSTEMD_DAEMON
#include <systemd/sd-daemon.h>
#endif
#include <pulsecore/core-error.h>
#include <pulsecore/core-util.h>
@ -221,6 +218,7 @@ int pa_socket_set_sndbuf(int fd, size_t l) {
return 0;
}
<<<<<<< HEAD
#ifdef HAVE_SYS_UN_H
int pa_unix_socket_is_stale(const char *fn) {
@ -301,6 +299,8 @@ int pa_unix_socket_remove_stale(const char *fn) {
#endif /* HAVE_SYS_UN_H */
=======
>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
bool pa_socket_address_is_local(const struct sockaddr *sa) {
pa_assert(sa);