diff options
Diffstat (limited to 'pjlib/src/pj')
| -rw-r--r-- | pjlib/src/pj/ioqueue_common_abs.c | 4 | ||||
| -rw-r--r-- | pjlib/src/pj/os_timestamp_posix.c | 4 | ||||
| -rw-r--r-- | pjlib/src/pj/pool.c | 2 |
3 files changed, 6 insertions, 4 deletions
diff --git a/pjlib/src/pj/ioqueue_common_abs.c b/pjlib/src/pj/ioqueue_common_abs.c index db403e57..cd13b70b 100644 --- a/pjlib/src/pj/ioqueue_common_abs.c +++ b/pjlib/src/pj/ioqueue_common_abs.c @@ -497,13 +497,13 @@ void ioqueue_dispatch_read_event( pj_ioqueue_t *ioqueue, pj_ioqueue_key_t *h ) bytes_read = read_op->size; - if ((read_op->op == PJ_IOQUEUE_OP_RECV_FROM)) { + if (read_op->op == PJ_IOQUEUE_OP_RECV_FROM) { read_op->op = PJ_IOQUEUE_OP_NONE; rc = pj_sock_recvfrom(h->fd, read_op->buf, &bytes_read, read_op->flags, read_op->rmt_addr, read_op->rmt_addrlen); - } else if ((read_op->op == PJ_IOQUEUE_OP_RECV)) { + } else if (read_op->op == PJ_IOQUEUE_OP_RECV) { read_op->op = PJ_IOQUEUE_OP_NONE; rc = pj_sock_recv(h->fd, read_op->buf, &bytes_read, read_op->flags); diff --git a/pjlib/src/pj/os_timestamp_posix.c b/pjlib/src/pj/os_timestamp_posix.c index eec6ed1f..28805150 100644 --- a/pjlib/src/pj/os_timestamp_posix.c +++ b/pjlib/src/pj/os_timestamp_posix.c @@ -125,7 +125,9 @@ PJ_DEF(pj_status_t) pj_get_timestamp_freq(pj_timestamp *freq) #include <mach/clock.h> #include <errno.h> -#define NSEC_PER_SEC 1000000000 +#ifndef NSEC_PER_SEC +# define NSEC_PER_SEC 1000000000 +#endif PJ_DEF(pj_status_t) pj_get_timestamp(pj_timestamp *ts) { diff --git a/pjlib/src/pj/pool.c b/pjlib/src/pj/pool.c index 3e2e2686..7c4d34a5 100644 --- a/pjlib/src/pj/pool.c +++ b/pjlib/src/pj/pool.c @@ -143,7 +143,7 @@ PJ_DEF(void*) pj_pool_allocate_find(pj_pool_t *pool, pj_size_t size) pj_assert(p != NULL); #if PJ_DEBUG if (p == NULL) { - p = p; + PJ_UNUSED_ARG(p); } #endif return p; |