diff --git a/src/network.c b/src/network.c index 8f7a469..2a17ddf 100644 --- a/src/network.c +++ b/src/network.c @@ -5,7 +5,6 @@ #include #include -#include #include #include #include diff --git a/src/util.c b/src/util.c index 914b30f..2b2445a 100644 --- a/src/util.c +++ b/src/util.c @@ -31,3 +31,25 @@ int64_t round_div(int64_t a, int64_t b) { return (a + (b / 2)) / b; } + +void PTHREAD_MUTEX_UNLOCK(pthread_mutex_t *x) +{ + int i; + i = pthread_mutex_unlock(x); + if (i) { + fprintf(stderr, "pthread_mutex_unlock failed, %d, %s\n", i, + strerror(i)); + exit(EXIT_FAILURE); + } +} + +void PTHREAD_MUTEX_LOCK(pthread_mutex_t *x) +{ + int i; + i = pthread_mutex_lock(x); + if (i) { + fprintf(stderr, "pthread_mutex_lock failed, %d, %s\n", i, + strerror(i)); + exit(EXIT_FAILURE); + } +} diff --git a/src/util.h b/src/util.h index 89cdb57..1b2543b 100644 --- a/src/util.h +++ b/src/util.h @@ -5,6 +5,7 @@ * \brief utility functions */ +#include #include #include @@ -20,30 +21,13 @@ /** * \brief wrapper for pthread_mutex_lock() */ -#define PTHREAD_MUTEX_LOCK(x)\ -({\ - int i;\ - i = pthread_mutex_lock(x);\ - if (i) { \ - fprintf(stderr, "pthread_mutex_lock failed, %d, %s\n", i, \ - strerror(i));\ - exit(EXIT_FAILURE);\ - }\ -}) +void PTHREAD_MUTEX_LOCK(pthread_mutex_t *x); /** * \brief wrapper for pthread_mutex_unlock() */ -#define PTHREAD_MUTEX_UNLOCK(x)\ -({\ - int i;\ - i = pthread_mutex_unlock(x);\ - if (i) { \ - fprintf(stderr, "pthread_mutex_unlock failed, %d, %s\n", i, \ - strerror(i));\ - exit(EXIT_FAILURE);\ - }\ -}) +void PTHREAD_MUTEX_UNLOCK(pthread_mutex_t *x); + /** * \brief append a path