mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-12-16 08:56:40 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

a few FreeBSD fixes, from alexis

Browse source 
Signed-off-by: Lennart Poettering <lennart@poettering.net>
This commit is contained in:
Lennart Poettering 2008-10-01 01:31:56 +02:00
parent f04cfcd4f0
commit 644f39d261
4 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/Makefile.am
View file

@ -62,8 +62,8 @@ AM_CFLAGS += -DPA_MACHINE_ID=\"$(localstatedir)/lib/dbus/machine-id\"
# This cool debug trap works on i386/gcc only # This cool debug trap works on i386/gcc only
AM_CFLAGS += '-DDEBUG_TRAP=__asm__("int $$3")' AM_CFLAGS += '-DDEBUG_TRAP=__asm__("int $$3")'
AM_LIBADD = $(PTHREAD_LIBS) AM_LIBADD = $(PTHREAD_LIBS) $(INTLLIBS)
AM_LDADD = $(PTHREAD_LIBS) AM_LDADD = $(PTHREAD_LIBS) $(INTLLIBS)
# Only required on some platforms but defined for all to avoid errors # Only required on some platforms but defined for all to avoid errors
AM_LDFLAGS = -Wl,-no-undefined -Wl,--gc-sections AM_LDFLAGS = -Wl,-no-undefined -Wl,--gc-sections

2
src/pulsecore/core-util.c
View file

@ -2351,7 +2351,7 @@ int pa_reset_sigs(int except, ...) {
int pa_reset_sigsv(const int except[]) { int pa_reset_sigsv(const int except[]) {
int sig; int sig;
for (sig = 1; sig < _NSIG; sig++) { for (sig = 1; sig < NSIG; sig++) {
pa_bool_t reset = TRUE; pa_bool_t reset = TRUE;
switch (sig) { switch (sig) {

2
src/pulsecore/proplist-util.c
View file

@ -37,7 +37,7 @@
void pa_init_proplist(pa_proplist *p) { void pa_init_proplist(pa_proplist *p) {
int a, b; int a, b;
#ifndef HAVE_DECL_ENVIRON #if !HAVE_DECL_ENVIRON
extern char **environ; extern char **environ;
#endif #endif
char **e; char **e;

2
src/pulsecore/protocol-native.c
View file

@ -2192,6 +2192,7 @@ static void command_auth(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_ta
if (c->version < 10 || (c->version >= 13 && !shm_on_remote)) if (c->version < 10 || (c->version >= 13 && !shm_on_remote))
do_shm = FALSE; do_shm = FALSE;
#ifdef HAVE_CREDS
if (do_shm) { if (do_shm) {
/* Only enable SHM if both sides are owned by the same /* Only enable SHM if both sides are owned by the same
* user. This is a security measure because otherwise data * user. This is a security measure because otherwise data
@ -2201,6 +2202,7 @@ static void command_auth(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_ta
if (!(creds = pa_pdispatch_creds(pd)) || getuid() != creds->uid) if (!(creds = pa_pdispatch_creds(pd)) || getuid() != creds->uid)
do_shm = FALSE; do_shm = FALSE;
} }
#endif
pa_log_debug("Negotiated SHM: %s", pa_yes_no(do_shm)); pa_log_debug("Negotiated SHM: %s", pa_yes_no(do_shm));
pa_pstream_enable_shm(c->pstream, do_shm); pa_pstream_enable_shm(c->pstream, do_shm);