1
0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-30 10:38:37 +00:00

Remove now redundant #include patch, and fix conflicting 7.x patch.

Approved by:	wxs (mentor)
This commit is contained in:
Joseph S. Atkinson 2012-01-09 04:09:41 +00:00
parent fe45fe7690
commit 5e76294b57
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=288807
2 changed files with 5 additions and 16 deletions

View File

@ -1,14 +1,13 @@
B
--- ./modules/misc/inhibit/xdg.c.orig 2011-11-25 13:17:54.000000000 -0500
+++ ./modules/misc/inhibit/xdg.c 2011-11-25 13:31:37.000000000 -0500
@@ -26,7 +26,6 @@
#include <vlc_plugin.h>
--- ./modules/misc/inhibit/xdg.c.orig 2011-11-22 15:30:36.000000000 -0500
+++ ./modules/misc/inhibit/xdg.c 2012-01-08 15:29:41.000000000 -0500
@@ -27,7 +27,6 @@
#include <vlc_inhibit.h>
#include <assert.h>
#include <signal.h>
-#include <spawn.h>
#include <sys/wait.h>
#include <signal.h>
static int Open (vlc_object_t *);
@@ -47,7 +46,6 @@
vlc_thread_t thread;
vlc_cond_t update, inactive;

View File

@ -1,10 +0,0 @@
--- ./modules/misc/inhibit/xdg.c.orig 2011-11-13 19:05:10.000000000 -0500
+++ ./modules/misc/inhibit/xdg.c 2011-11-13 19:06:20.000000000 -0500
@@ -28,6 +28,7 @@
#include <assert.h>
#include <spawn.h>
#include <sys/wait.h>
+#include <signal.h>
static int Open (vlc_object_t *);
static void Close (vlc_object_t *);