diff options
| author | Robin Watts <robin.watts@artifex.com> | 2016-09-27 17:07:02 +0100 |
|---|---|---|
| committer | Robin Watts <robin.watts@artifex.com> | 2016-09-27 17:07:31 +0100 |
| commit | 27e01aa77d0cf1668f60d87cf7417c90bf309d1b (patch) | |
| tree | 537708f92946b7bb7c1cd2c8a509d1d831c30ce4 /openjpeg | |
| parent | 9a78bfb8698061e22e3d460b8c15825992e44def (diff) | |
| download | ghostpdl-27e01aa77d0cf1668f60d87cf7417c90bf309d1b.tar.gz | |
Squash 2 warnings in the openjpeg code.
Diffstat (limited to 'openjpeg')
| -rw-r--r-- | openjpeg/src/lib/openjp2/j2k.c | 2 | ||||
| -rw-r--r-- | openjpeg/src/lib/openjp2/thread.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/openjpeg/src/lib/openjp2/j2k.c b/openjpeg/src/lib/openjp2/j2k.c index 0cceaef03..de6fba409 100644 --- a/openjpeg/src/lib/openjp2/j2k.c +++ b/openjpeg/src/lib/openjp2/j2k.c @@ -5971,7 +5971,7 @@ OPJ_BOOL opj_j2k_set_threads(opj_j2k_t *j2k, OPJ_UINT32 num_threads) return OPJ_FALSE; } -static int opj_j2k_get_default_thread_count() +static int opj_j2k_get_default_thread_count(void) { const char* num_threads = getenv("OPJ_NUM_THREADS"); if( num_threads == NULL || !opj_has_thread_support() ) diff --git a/openjpeg/src/lib/openjp2/thread.c b/openjpeg/src/lib/openjp2/thread.c index 79a9d5fb4..cf497e174 100644 --- a/openjpeg/src/lib/openjp2/thread.c +++ b/openjpeg/src/lib/openjp2/thread.c @@ -287,7 +287,7 @@ void opj_thread_join( opj_thread_t* thread ) opj_free(thread); } -#elif MUTEX_pthread +#elif defined(MUTEX_pthread) #include <pthread.h> #include <stdlib.h> |