Merge remote-tracking branch 'origin/pr/329'

Conflicts:
	src/tvheadend.h

diff --cc src/channels.c
index b3aea46f61d041ab19a9ff6c9d64013876ea7efd,bddce831ed99bf1a7b202e2a98bf74ac24b5b061..5105a5225d65ab910b993adb31c4205b329d0648
--- 1/src/channels.c
--- 2/src/channels.c
+++ b/src/channels.c
@@@ -575,11 -576,9 +579,12 @@@ channel_delete ( channel_t *ch, int del
    epggrab_channel_rem(ch);
    epg_channel_unlink(ch);
  
 +  /* HTSP */
 +  htsp_channel_delete(ch);
 +
    /* Settings */
-   hts_settings_remove("channel/%s", idnode_uuid_as_str(&ch->ch_id));
+   if (delconf)
+     hts_settings_remove("channel/%s", idnode_uuid_as_str(&ch->ch_id));
  
    /* Free memory */
    RB_REMOVE(&channels, ch, ch_link);

diff --cc src/descrambler/capmt.c
Simple merge

diff --cc src/input/mpegts/linuxdvb/linuxdvb.c
Simple merge

diff --cc src/input/mpegts/linuxdvb/linuxdvb_adapter.c
Simple merge

diff --cc src/input/mpegts/linuxdvb/linuxdvb_frontend.c
Simple merge

diff --cc src/input/mpegts/linuxdvb/linuxdvb_private.h
Simple merge

diff --cc src/input/mpegts/linuxdvb/linuxdvb_satconf.c
Simple merge

diff --cc src/service_mapper.c
Simple merge

diff --cc src/tvheadend.h
index a52185100484d1900fd6b1c6891f85f743272cdc,b8c68f866143bbefd68110d5eb2973dc8c0e810a..d4af5fc90cc20472cf64b852a0fba2e456699df4
--- 1/src/tvheadend.h
--- 2/src/tvheadend.h
+++ b/src/tvheadend.h
@@@ -604,8 -607,14 +608,13 @@@ int rmtree ( const char *path )
  
  char *regexp_escape ( const char *str );
  
 -#ifdef PLATFORM_LINUX
+ #define SKEL_DECLARE(name, type) type *name;
+ #define SKEL_ALLOC(name) do { if (!name) name = calloc(1, sizeof(*name)); } while (0)
+ #define SKEL_USED(name) do { name = NULL; } while (0)
+ #define SKEL_FREE(name) do { free(name); name = NULL; } while (0)
+ 
  /* glibc wrapper */
 -#if !__GLIBC_PREREQ(2,8)
 +#if ! ENABLE_QSORT_R
  void
  qsort_r(void *base, size_t nmemb, size_t size,
         int (*cmp)(const void *, const void *, void *), void *aux);

diff --cc src/wrappers.c
Simple merge