mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-29 00:11:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add src/compatibility.h to include software-dependency macros

Browse Source
This commit is contained in:
M. Liebmann
2017-03-08 12:22:43 +01:00
parent b58aa9ad6f
commit 87b7260c48
3 changed files with 42 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/compatibility.h Normal file
View File

@@ -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__

16
src/eitd/sectionsd.cpp
View File

@@ -55,15 +55,7 @@
#include "xmlutil.h"
#include "debug.h"
#ifdef __UCLIBC__
#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
#include <compatibility.h>
//#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);
}
//---------------------------------------------------------------------

13
src/neutrino.cpp
View File

@@ -138,6 +138,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>
@@ -4706,15 +4708,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
}