mirror of
https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git
synced 2025-11-08 13:29:59 -05:00
Apply #ifdefs around functionality not available on win32
And also the reverse: around some win32 specific functionality
This commit is contained in:
parent
0ac0479534
commit
bb12ff8356
20 changed files with 120 additions and 13 deletions
|
|
@ -180,6 +180,7 @@ static void update_rule(struct rule *r) {
|
|||
DIR *desktopfiles_dir;
|
||||
struct dirent *dir;
|
||||
|
||||
#ifdef DT_DIR
|
||||
/* Let's try a more aggressive search, but only one level */
|
||||
if ((desktopfiles_dir = opendir(DESKTOPFILEDIR))) {
|
||||
while ((dir = readdir(desktopfiles_dir))) {
|
||||
|
|
@ -200,6 +201,7 @@ static void update_rule(struct rule *r) {
|
|||
}
|
||||
closedir(desktopfiles_dir);
|
||||
}
|
||||
#endif
|
||||
}
|
||||
if (!found) {
|
||||
r->good = FALSE;
|
||||
|
|
|
|||
|
|
@ -105,10 +105,14 @@ int pa__init(pa_module*m) {
|
|||
* of log messages, particularly because if stdout and stderr are
|
||||
* dup'ed they share the same O_NDELAY, too. */
|
||||
|
||||
#ifndef OS_IS_WIN32
|
||||
if ((fd = pa_open_cloexec("/dev/tty", O_RDWR|O_NONBLOCK, 0)) >= 0) {
|
||||
io = pa_iochannel_new(m->core->mainloop, fd, fd);
|
||||
pa_log_debug("Managed to open /dev/tty.");
|
||||
} else {
|
||||
}
|
||||
else
|
||||
#endif
|
||||
{
|
||||
io = pa_iochannel_new(m->core->mainloop, STDIN_FILENO, STDOUT_FILENO);
|
||||
pa_iochannel_set_noclose(io, TRUE);
|
||||
pa_log_debug("Failed to open /dev/tty, using stdin/stdout fds instead.");
|
||||
|
|
|
|||
|
|
@ -31,9 +31,18 @@
|
|||
#include <fcntl.h>
|
||||
#include <unistd.h>
|
||||
#include <limits.h>
|
||||
|
||||
#ifdef HAVE_NETINET_IN_H
|
||||
#include <netinet/in.h>
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_NETINET_TCP_H
|
||||
#include <netinet/tcp.h>
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_SYS_IOCTL_H
|
||||
#include <sys/ioctl.h>
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_LINUX_SOCKIOS_H
|
||||
#include <linux/sockios.h>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue