aboutsummaryrefslogtreecommitdiffstats
path: root/src/beaver-target-qemu.c
diff options
context:
space:
mode:
authorJoshua Lock <josh@linux.intel.com>2009-12-04 12:58:47 +0000
committerJoshua Lock <josh@linux.intel.com>2009-12-04 14:04:41 +0000
commitd9b3d6b2febf1d0e9ddb1ee83082d243053fb6c7 (patch)
tree5c798ccd459429d4a6c2ef35e8df4c09d5433a08 /src/beaver-target-qemu.c
parent33137a546bc750c7dc04d36543b822efe23db21c (diff)
downloadanjuta-poky-d9b3d6b2febf1d0e9ddb1ee83082d243053fb6c7.tar.gz
anjuta-poky-d9b3d6b2febf1d0e9ddb1ee83082d243053fb6c7.tar.bz2
anjuta-poky-d9b3d6b2febf1d0e9ddb1ee83082d243053fb6c7.zip
Add conditional support for updated interfaces in Anjuta 2.28
Rebased patch from Haito Feng <haito.feng@intel.com> Signed-off-by: Joshua Lock <josh@linux.intel.com>
Diffstat (limited to 'src/beaver-target-qemu.c')
-rw-r--r--src/beaver-target-qemu.c16
1 files changed, 14 insertions, 2 deletions
diff --git a/src/beaver-target-qemu.c b/src/beaver-target-qemu.c
index a5fb371..41f35fb 100644
--- a/src/beaver-target-qemu.c
+++ b/src/beaver-target-qemu.c
@@ -239,8 +239,9 @@ beaver_target_qemu_start (BeaverTargetQEMU *btq, GError **out_err)
if (priv->kernel && priv->rootfs)
{
gchar *args[] = {QEMU_SCRIPT, priv->kernel, priv->rootfs, NULL};
-#ifdef ANJUTA_2_23_OR_HIGHER
+#ifdef ANJUTA_2_28_OR_HIGHER
if (!anjuta_launcher_execute_v (priv->launcher,
+ NULL,
args,
NULL,
launcher_data_cb,
@@ -249,16 +250,27 @@ beaver_target_qemu_start (BeaverTargetQEMU *btq, GError **out_err)
g_warning ("Error launching QEMU");
return FALSE;
#else
+#ifdef ANJUTA_2_23_TO_26
if (!anjuta_launcher_execute_v (priv->launcher,
args,
+ NULL,
launcher_data_cb,
btq))
{
g_warning ("Error launching QEMU");
return FALSE;
+#else
+ if (!anjuta_launcher_execute_v (priv->launcher,
+ args,
+ launcher_data_cb,
+ btq))
+ {
+ g_warning ("Error launching QEMU");
+ return FALSE;
+#endif
#endif
} else {
- beaver_target_qemu_set_state (BEAVER_TARGET (btq),
+ beaver_target_qemu_set_state (BEAVER_TARGET (btq),
TARGET_STATE_READY);
}
}