diff options
author | Bartłomiej Piotrowski <b@bpiotrowski.pl> | 2013-09-26 14:47:44 +0200 |
---|---|---|
committer | Bartłomiej Piotrowski <b@bpiotrowski.pl> | 2013-09-26 14:47:55 +0200 |
commit | 73a54576d1203ac707c7634e25a3730c2ef2f9a6 (patch) | |
tree | 7ec901fcbb86919430b0f67d22ad49c3fe355576 /main/vlc/uclibc-inhibit-spawn.patch | |
parent | 180c6d87f35bf6d16f77293d5d7a283f066cf8cd (diff) | |
download | aports-73a54576d1203ac707c7634e25a3730c2ef2f9a6.tar.bz2 aports-73a54576d1203ac707c7634e25a3730c2ef2f9a6.tar.xz |
main/vlc: declare err variable in xdg.c
Diffstat (limited to 'main/vlc/uclibc-inhibit-spawn.patch')
-rw-r--r-- | main/vlc/uclibc-inhibit-spawn.patch | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/main/vlc/uclibc-inhibit-spawn.patch b/main/vlc/uclibc-inhibit-spawn.patch index f1da2a152..5a8033add 100644 --- a/main/vlc/uclibc-inhibit-spawn.patch +++ b/main/vlc/uclibc-inhibit-spawn.patch @@ -1,6 +1,6 @@ diff -rupN a/modules/misc/inhibit/xdg.c b/modules/misc/inhibit/xdg.c --- a/modules/misc/inhibit/xdg.c 2013-06-24 20:00:38.000000000 +0200 -+++ b/modules/misc/inhibit/xdg.c 2013-09-26 14:08:51.209759907 +0200 ++++ b/modules/misc/inhibit/xdg.c 2013-09-26 14:45:13.069727587 +0200 @@ -28,7 +28,11 @@ #include <assert.h> #include <errno.h> @@ -24,18 +24,20 @@ diff -rupN a/modules/misc/inhibit/xdg.c b/modules/misc/inhibit/xdg.c }; extern char **environ; -@@ -60,8 +66,10 @@ static void Timer (void *data) +@@ -60,8 +66,12 @@ static void Timer (void *data) }; pid_t pid; +#if (_POSIX_SPAWN >= 0) int err = posix_spawnp (&pid, "xdg-screensaver", NULL, &sys->attr, argv, environ); ++#else ++ int err; +#endif if (err == 0) { int status; -@@ -91,6 +99,7 @@ static int Open (vlc_object_t *obj) +@@ -91,6 +101,7 @@ static int Open (vlc_object_t *obj) if (p_sys == NULL) return VLC_ENOMEM; @@ -43,7 +45,7 @@ diff -rupN a/modules/misc/inhibit/xdg.c b/modules/misc/inhibit/xdg.c posix_spawnattr_init (&p_sys->attr); /* Reset signal handlers to default and clear mask in the child process */ { -@@ -103,11 +112,14 @@ static int Open (vlc_object_t *obj) +@@ -103,11 +114,14 @@ static int Open (vlc_object_t *obj) posix_spawnattr_setflags (&p_sys->attr, POSIX_SPAWN_SETSIGDEF | POSIX_SPAWN_SETSIGMASK); } @@ -58,7 +60,7 @@ diff -rupN a/modules/misc/inhibit/xdg.c b/modules/misc/inhibit/xdg.c free (p_sys); return VLC_ENOMEM; } -@@ -122,6 +134,8 @@ static void Close (vlc_object_t *obj) +@@ -122,6 +136,8 @@ static void Close (vlc_object_t *obj) vlc_inhibit_sys_t *p_sys = ih->p_sys; vlc_timer_destroy (p_sys->timer); |