From 9f9f816a348a5e8dbb208f9ff081e8ab1d24606b Mon Sep 17 00:00:00 2001 From: User Decke Date: Sat, 4 Jan 2014 22:23:46 +0000 Subject: [PATCH] build: Fix compiler warning and properly cast return value of pthread_self() to long --- src/tvhlog.c | 2 +- src/wrappers.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/tvhlog.c b/src/tvhlog.c index ac42dc3c..ece17b33 100644 --- a/src/tvhlog.c +++ b/src/tvhlog.c @@ -307,7 +307,7 @@ void tvhlogv ( const char *file, int line, /* Basic message */ l = 0; if (options & TVHLOG_OPT_THREAD) { - l += snprintf(buf + l, sizeof(buf) - l, "tid %ld: ", pthread_self()); + l += snprintf(buf + l, sizeof(buf) - l, "tid %ld: ", (long)pthread_self()); } l += snprintf(buf + l, sizeof(buf) - l, "%s: ", subsys); if (options & TVHLOG_OPT_FILELINE && severity >= LOG_DEBUG) diff --git a/src/wrappers.c b/src/wrappers.c index 4167b902..ef63508e 100644 --- a/src/wrappers.c +++ b/src/wrappers.c @@ -99,7 +99,7 @@ thread_wrapper ( void *p ) /* Run */ tvhdebug("thread", "created thread %ld [%s / %p(%p)]", - pthread_self(), ts->name, ts->run, ts->arg); + (long)pthread_self(), ts->name, ts->run, ts->arg); void *r = ts->run(ts->arg); free(ts);