mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-01 09:51:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	lib/libdvbsub/dvbsub.cpp
	lib/libtuxtxt/tuxtxt.cpp
	src/driver/lcdd.cpp
	src/zapit/src/femanager.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 40c7218952
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-12 (Sun, 12 Feb 2017)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-02-12 23:04:09 +01:00
parent 8a8036b8b8 6e85f1b0ca
commit ff7b7dfde7
35 changed files with 111 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/eitd/sectionsd.cpp
View File

@@ -2112,6 +2112,7 @@ static void print_meminfo(void)
static void *houseKeepingThread(void *)
{
int count = 0, scount = 0, ecount = 0;
set_threadname("sd:housekeeping");
dprintf("housekeeping-thread started.\n");
pthread_setcanceltype (PTHREAD_CANCEL_ASYNCHRONOUS, 0);