Merge branch '1-stable' into branch 'main'
This commit is contained in:
commit
7a114d3d01
|
@ -32,6 +32,8 @@
|
||||||
#include <stdbool.h> /* C99 bool */
|
#include <stdbool.h> /* C99 bool */
|
||||||
#include <stdlib.h> /* pid_t */
|
#include <stdlib.h> /* pid_t */
|
||||||
|
|
||||||
|
#include <unistd.h> // for pid_t
|
||||||
|
|
||||||
void alsapid_compose_src_link(int alsa_client_id, char * buffer);
|
void alsapid_compose_src_link(int alsa_client_id, char * buffer);
|
||||||
void alsapid_compose_dst_link(char * buffer);
|
void alsapid_compose_dst_link(char * buffer);
|
||||||
bool alsapid_get_pid(int alsa_client_id, pid_t * pid_ptr);
|
bool alsapid_get_pid(int alsa_client_id, pid_t * pid_ptr);
|
||||||
|
|
|
@ -33,6 +33,8 @@
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
|
|
||||||
|
#include <libgen.h>
|
||||||
|
|
||||||
void alsapid_compose_src_link(int alsa_client_id, char * buffer)
|
void alsapid_compose_src_link(int alsa_client_id, char * buffer)
|
||||||
{
|
{
|
||||||
sprintf(buffer, "/tmp/alsapid-%lld-%d", (long long)getuid(), alsa_client_id);
|
sprintf(buffer, "/tmp/alsapid-%lld-%d", (long long)getuid(), alsa_client_id);
|
||||||
|
|
|
@ -30,6 +30,7 @@
|
||||||
#include <sys/stat.h>
|
#include <sys/stat.h>
|
||||||
#include <signal.h>
|
#include <signal.h>
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
|
#include <sys/wait.h>
|
||||||
|
|
||||||
#include "app_supervisor.h"
|
#include "app_supervisor.h"
|
||||||
#include "../dbus_constants.h"
|
#include "../dbus_constants.h"
|
||||||
|
|
|
@ -30,10 +30,18 @@
|
||||||
|
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
#include <fcntl.h>
|
#include <fcntl.h>
|
||||||
#include <pty.h> /* forkpty() */
|
#if !defined(__FreeBSD__)
|
||||||
|
# include <pty.h> /* forkpty() */
|
||||||
|
#else
|
||||||
|
# include <sys/types.h>
|
||||||
|
# include <sys/ioctl.h>
|
||||||
|
# include <termios.h>
|
||||||
|
# include <libutil.h>
|
||||||
|
#endif
|
||||||
#include <sys/wait.h>
|
#include <sys/wait.h>
|
||||||
#include <sys/time.h>
|
#include <sys/time.h>
|
||||||
#include <sys/resource.h>
|
#include <sys/resource.h>
|
||||||
|
#include <signal.h>
|
||||||
|
|
||||||
#include "loader.h"
|
#include "loader.h"
|
||||||
#include "../proxies/conf_proxy.h"
|
#include "../proxies/conf_proxy.h"
|
||||||
|
|
|
@ -28,6 +28,7 @@
|
||||||
#define GRAPH_PROXY_H__61D1ED56_E33B_4F50_B45B_F520979E8AA7__INCLUDED
|
#define GRAPH_PROXY_H__61D1ED56_E33B_4F50_B45B_F520979E8AA7__INCLUDED
|
||||||
|
|
||||||
#include "common.h"
|
#include "common.h"
|
||||||
|
#include <unistd.h>
|
||||||
|
|
||||||
typedef struct graph_proxy_tag { int unused; } * graph_proxy_handle;
|
typedef struct graph_proxy_tag { int unused; } * graph_proxy_handle;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue