Merge branch 'master' into pu/fb-setmode

This commit is contained in:
M. Liebmann
2017-03-08 12:35:39 +01:00
3 changed files with 42 additions and 21 deletions

View File

@@ -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>
@@ -4826,15 +4828,8 @@ void CNeutrinoApp::Cleanup()
delete CEitManager::getInstance();
printf("cleanup 6\n");fflush(stdout);
delete CVFD::getInstance();
#ifdef __UCLIBC__
#if (__UCLIBC_MAJOR__ >= 1) && (__UCLIBC_MINOR__ >= 0) && (__UCLIBC_SUBLEVEL__ >= 10)
malloc_stats();
#else
malloc_stats(NULL);
#endif
#else
malloc_stats();
#endif
comp_malloc_stats(NULL);
#endif
}