From e9fb741134bcb1c412cbd70af633d902875e8864 Mon Sep 17 00:00:00 2001 From: seife Date: Sat, 7 May 2011 09:06:03 +0000 Subject: [PATCH] fix "converting to non-pointer type 'pthread_t'" compiler warning pthread_t is - at least on our platform - not a pointer type, but basically an int don't assign NULL but 0 to fix that warning git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1440 e54a6e83-5905-42d5-8d5c-058d10e6a962 --- lib/libdvbsub/dvbsub.cpp | 4 ++-- lib/libtuxtxt/tuxtxt.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/libdvbsub/dvbsub.cpp b/lib/libdvbsub/dvbsub.cpp index d9c8c9d04..b573a31b5 100644 --- a/lib/libdvbsub/dvbsub.cpp +++ b/lib/libdvbsub/dvbsub.cpp @@ -174,7 +174,7 @@ int dvbsub_close() pthread_mutex_unlock(&readerMutex); pthread_join(threadReader, NULL); - threadReader = NULL; + threadReader = 0; } if(threadDvbsub) { dvbsub_running = false; @@ -184,7 +184,7 @@ int dvbsub_close() pthread_mutex_unlock(&packetMutex); pthread_join(threadDvbsub, NULL); - threadDvbsub = NULL; + threadDvbsub = 0; } printf("[dvb-sub] stopped\n"); diff --git a/lib/libtuxtxt/tuxtxt.cpp b/lib/libtuxtxt/tuxtxt.cpp index 7b6dd280d..c568cebc4 100644 --- a/lib/libtuxtxt/tuxtxt.cpp +++ b/lib/libtuxtxt/tuxtxt.cpp @@ -1548,7 +1548,7 @@ void tuxtx_stop_subtitle() reader_running = 0; if(ttx_sub_thread) pthread_join(ttx_sub_thread, NULL); - ttx_sub_thread = NULL; + ttx_sub_thread = 0; sub_pid = sub_page = 0; ttx_paused = 0; }