summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorSergey Kandaurov <pluknet@nginx.com>2017-09-27 18:34:24 +0300
committerSergey Kandaurov <pluknet@nginx.com>2017-09-27 18:34:24 +0300
commit752038eea857988045ce72252e0d1c19509981b3 (patch)
treec93823c3039903f0bf42a1c787923d2c90a5395b
parent9213299d1f31476a506824dc918bc576ae789b89 (diff)
downloadunit-752038eea857988045ce72252e0d1c19509981b3.tar.gz
unit-752038eea857988045ce72252e0d1c19509981b3.tar.bz2
Fixed building with pthread_t defined as a pointer.
-rw-r--r--src/nxt_random.c2
-rw-r--r--src/nxt_sprintf.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/nxt_random.c b/src/nxt_random.c
index 38b14e56..3dde1f15 100644
--- a/src/nxt_random.c
+++ b/src/nxt_random.c
@@ -85,7 +85,7 @@ nxt_random_stir(nxt_random_t *r)
key.value[0] ^= tv.tv_usec;
key.value[1] ^= tv.tv_sec;
key.value[2] ^= nxt_pid;
- key.value[3] ^= nxt_thread_tid(NULL);
+ key.value[3] ^= (uintptr_t) nxt_thread_tid(NULL);
}
nxt_random_add(r, key.bytes, NXT_RANDOM_KEY_SIZE);
diff --git a/src/nxt_sprintf.c b/src/nxt_sprintf.c
index 933ce997..c07b44da 100644
--- a/src/nxt_sprintf.c
+++ b/src/nxt_sprintf.c
@@ -497,7 +497,7 @@ nxt_vsprintf(u_char *buf, u_char *end, const char *fmt, va_list args)
goto number;
case 'T':
- ui64 = (uint64_t) va_arg(args, nxt_tid_t);
+ ui64 = (uint64_t) (uintptr_t) va_arg(args, nxt_tid_t);
sign = 0;
goto number;
#if 0