Merge branch 'master' into pu/fb-setmode

Origin commit data
------------------
Branch: ni/coolstream
Commit: 6a531d4304
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-08 (Wed, 08 Mar 2017)


------------------
No further description and justification available within origin commit message!

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

src/compatibility.h

@@ -0,0 +1,34 @@
+/*
+	Based up Neutrino-GUI - Tuxbox-Project
+	Copyright (C) 2001 by Steffen Hehn 'McClean'
+
+	Copyright (C) 2017, Michael Liebmann 'micha-bbg'
+
+	License: GPL
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public
+	License as published by the Free Software Foundation; either
+	version 2 of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+	General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef __COMPATIBILITY_H__
+#define __COMPATIBILITY_H__
+
+
+#if !defined __UCLIBC__ || ((__UCLIBC_MAJOR__ >= 1) && (__UCLIBC_MINOR__ >= 0) && (__UCLIBC_SUBLEVEL__ >= 10))
+#define comp_malloc_stats(a) malloc_stats()
+#else
+#define comp_malloc_stats(a) malloc_stats(a)
+#endif
+
+
+#endif // __COMPATIBILITY_H__

src/eitd/sectionsd.cpp

@@ -55,15 +55,7 @@
 #include "xmlutil.h"
 #include "debug.h"
 
-#ifdef __UCLIBC__
+#include <compatibility.h>
-#if (__UCLIBC_MAJOR__ >= 1) && (__UCLIBC_MINOR__ >= 0) && (__UCLIBC_SUBLEVEL__ >= 10)
-#define MALLOC_STATS(a) malloc_stats()
-#else
-#define MALLOC_STATS(a) malloc_stats(a)
-#endif
-#else
-#define MALLOC_STATS(a) malloc_stats()
-#endif
 
 //#define ENABLE_SDT //FIXME
 
@@ -1077,7 +1069,7 @@ static void commandDumpStatusInformation(int /*connfd*/, char* /*data*/, const u
 		 //    resourceUsage.ru_maxrss, resourceUsage.ru_ixrss, resourceUsage.ru_idrss, resourceUsage.ru_isrss,
 		);
 	printf("%s\n", stati);
-	MALLOC_STATS(NULL);
+	comp_malloc_stats(NULL);
 	return ;
 }
 
@@ -1206,7 +1198,7 @@ static void FreeMemory()
 
 	unlockEvents();
 
-	MALLOC_STATS(NULL);
+	comp_malloc_stats(NULL);
 	xprintf("[sectionsd] free memory done\n");
 	//wakeupAll(); //FIXME should we re-start eit here ?
 }
@@ -2056,7 +2048,7 @@ static void print_meminfo(void)
 	if (!sections_debug)
 		return;
 
-	MALLOC_STATS(NULL);
+	comp_malloc_stats(NULL);
 }
 
 //---------------------------------------------------------------------

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>
@@ -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)
+	comp_malloc_stats(NULL);
-	malloc_stats();
-#else
-	malloc_stats(NULL);
-#endif
-#else
-	malloc_stats();
-#endif
 #endif
 }