mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-09-01 18:01:06 +02:00
Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
src/neutrino.cpp
Origin commit data
------------------
Branch: ni/coolstream
Commit: af8c4b8d97
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-12 (Sun, 12 Feb 2017)
------------------
This commit was generated by Migit
This commit is contained in:
@@ -2069,6 +2069,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);
|
||||
|
Reference in New Issue
Block a user