From f74ab3f21ff66278b437b799f17cbb2f58db7f21 Mon Sep 17 00:00:00 2001
From: Colin Fletcher <colin.m.fletcher@googlemail.com>
Date: Mon, 7 Oct 2013 21:16:42 +0100
Subject: [PATCH] Move system_exec from gtk2_ardour/ to libs/pbd/

Conflicts:
	gtk2_ardour/ardour_ui.cc
	gtk2_ardour/transcode_ffmpeg.h
	gtk2_ardour/video_monitor.h
	libs/pbd/system_exec.cc
---
 gtk2_ardour/ardour_ui.cc       | 1 +
 gtk2_ardour/transcode_ffmpeg.h | 1 +
 gtk2_ardour/video_monitor.h    | 3 ++-
 libs/pbd/system_exec.cc        | 2 --
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc
index 69830ade65..e7dc6e8ca2 100644
--- a/gtk2_ardour/ardour_ui.cc
+++ b/gtk2_ardour/ardour_ui.cc
@@ -52,6 +52,7 @@
 #include "pbd/openuri.h"
 #include "pbd/file_utils.h"
 #include "pbd/localtime_r.h"
+#include "pbd/system_exec.h"
 
 #include "gtkmm2ext/application.h"
 #include "gtkmm2ext/bindings.h"
diff --git a/gtk2_ardour/transcode_ffmpeg.h b/gtk2_ardour/transcode_ffmpeg.h
index b54d9e54c7..2c20bfbd4a 100644
--- a/gtk2_ardour/transcode_ffmpeg.h
+++ b/gtk2_ardour/transcode_ffmpeg.h
@@ -23,6 +23,7 @@
 #include <string>
 #include "ardour/system_exec.h"
 #include "ardour/types.h"
+#include "pbd/system_exec.h"
 
 
 /** @class TranscodeFfmpeg
diff --git a/gtk2_ardour/video_monitor.h b/gtk2_ardour/video_monitor.h
index d2ab91b3a7..38223e6eec 100644
--- a/gtk2_ardour/video_monitor.h
+++ b/gtk2_ardour/video_monitor.h
@@ -26,7 +26,8 @@
 #include "ardour/types.h"
 #include "ardour/session.h"
 #include "ardour/session_handle.h"
-#include "ardour/system_exec.h"
+
+#include "pbd/system_exec.h"
 
 namespace ARDOUR {
 	class Session;
diff --git a/libs/pbd/system_exec.cc b/libs/pbd/system_exec.cc
index 7814cce96b..51cd5d1fff 100644
--- a/libs/pbd/system_exec.cc
+++ b/libs/pbd/system_exec.cc
@@ -43,8 +43,6 @@
 #endif
 
 
-#define USE_VFORK
-
 #include "pbd/system_exec.h"
 
 using namespace std;