Merge branch 'ni/tuxbox' into ni/mp/tuxbox

Conflicts:
	lib/libdvbsub/dvbsubtitle.cpp
	src/neutrino.cpp
	src/nhttpd/tuxboxapi/neutrinoyparser.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 69d8616a91
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-12 (Sun, 12 Mar 2017)



------------------
This commit was generated by Migit

src/neutrino.cpp

@@ -139,6 +139,8 @@
 #include <linux/reboot.h>
 #include <sys/reboot.h>
 
+#include <compatibility.h>
+
 #include <lib/libdvbsub/dvbsub.h>
 #include <lib/libtuxtxt/teletext.h>
 #include <eitd/sectionsd.h>
@@ -5238,11 +5240,8 @@ void CNeutrinoApp::Cleanup()
 	delete CEitManager::getInstance();
 	printf("cleanup 6\n");fflush(stdout);
 	//delete CVFD::getInstance();
-#ifdef __UCLIBC__
-	malloc_stats(NULL);
-#else
-	//malloc_stats();
-#endif
+
+	comp_malloc_stats(NULL);
 #endif
 }