diff options
| author | Wim Taymans <wim.taymans@collabora.co.uk> | 2011-07-07 11:13:19 +0200 |
|---|---|---|
| committer | Wim Taymans <wim.taymans@collabora.co.uk> | 2011-07-07 11:13:19 +0200 |
| commit | b171259612d7ca2b29a7445be03d7702b51ab9c5 (patch) | |
| tree | 5edcf15eb6773a3909b8d42ba81dc24fd3497117 /gst/gsttask.c | |
| parent | 806cf03fbcbce0046331e2e349003e22238ee1a3 (diff) | |
| parent | 0993102834edd7172c7fc527646ae1f990786444 (diff) | |
| download | gstreamer-b171259612d7ca2b29a7445be03d7702b51ab9c5.tar.gz | |
Merge branch 'master' into 0.11
Conflicts:
libs/gst/base/gstbasesrc.c
Diffstat (limited to 'gst/gsttask.c')
| -rw-r--r-- | gst/gsttask.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gst/gsttask.c b/gst/gsttask.c index fba8c385b5..961f816b4f 100644 --- a/gst/gsttask.c +++ b/gst/gsttask.c @@ -225,7 +225,7 @@ gst_task_finalize (GObject * object) static void gst_task_configure_name (GstTask * task) { -#ifdef HAVE_SYS_PRCTL_H +#if defined(HAVE_SYS_PRCTL_H) && defined(PR_SET_NAME) const gchar *name; gchar thread_name[17] = { 0, }; |