mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-03 09:01:50 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

win32: Simplify dl_search_path code

Browse source 
And add #include <sys/stat.h>, needed by the code introduced in f7acd4bd.
This commit is contained in:
Maarten Bosmans 2011-03-22 16:02:23 +01:00 • committed by Colin Guthrie
parent ae35ec1ed5
commit 72323bc6bb
1 changed files with 6 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/daemon/daemon-conf.c
View file

@ -29,6 +29,7 @@
#include <string.h> #include <string.h>
#include <unistd.h> #include <unistd.h>
#include <fcntl.h> #include <fcntl.h>
#include <sys/stat.h>
#ifdef HAVE_SCHED_H #ifdef HAVE_SCHED_H
#include <sched.h> #include <sched.h>
@ -37,6 +38,7 @@
#include <pulse/xmalloc.h> #include <pulse/xmalloc.h>
#include <pulse/timeval.h> #include <pulse/timeval.h>
#include <pulse/i18n.h> #include <pulse/i18n.h>
#include <pulse/version.h>
#include <pulsecore/core-error.h> #include <pulsecore/core-error.h>
#include <pulsecore/core-util.h> #include <pulsecore/core-util.h>
@ -147,6 +149,10 @@ pa_daemon_conf* pa_daemon_conf_new(void) {
c = pa_xnewdup(pa_daemon_conf, &default_conf, 1); c = pa_xnewdup(pa_daemon_conf, &default_conf, 1);
#ifdef OS_IS_WIN32
c->dl_search_path = pa_sprintf_malloc("%s" PA_PATH_SEP "lib" PA_PATH_SEP "pulse-%d.%d" PA_PATH_SEP "modules",
pa_win32_get_toplevel(NULL), PA_MAJOR, PA_MINOR);
#else
#if defined(__linux__) && !defined(__OPTIMIZE__) #if defined(__linux__) && !defined(__OPTIMIZE__)
/* We abuse __OPTIMIZE__ as a check whether we are a debug build /* We abuse __OPTIMIZE__ as a check whether we are a debug build
@ -160,19 +166,6 @@ pa_daemon_conf* pa_daemon_conf_new(void) {
} else } else
#endif #endif
#ifdef OS_IS_WIN32
{
char *t;
char *majorminor = pa_xstrdup(VERSION);
char *toplevel = pa_win32_get_toplevel(NULL);
if ((t = strchr(majorminor, '-')))
*t = '\0';
c->dl_search_path = pa_sprintf_malloc("%s" PA_PATH_SEP "lib" PA_PATH_SEP "pulse-%s" PA_PATH_SEP "modules", toplevel, majorminor);
pa_xfree(majorminor);
}
#else
c->dl_search_path = pa_xstrdup(PA_DLSEARCHPATH); c->dl_search_path = pa_xstrdup(PA_DLSEARCHPATH);
#endif #endif