diff --git a/daemon/libs/pjproject-2.2.1/pjlib/src/pj/ioqueue_common_abs.c b/daemon/libs/pjproject-2.2.1/pjlib/src/pj/ioqueue_common_abs.c
index d80f4422664da6f50a8448d351be39b10f8321f3..2f62432c071e084799daaf07859b5c036e9ab6f3 100644
--- a/daemon/libs/pjproject-2.2.1/pjlib/src/pj/ioqueue_common_abs.c
+++ b/daemon/libs/pjproject-2.2.1/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/daemon/libs/pjproject-2.2.1/pjlib/src/pj/pool.c b/daemon/libs/pjproject-2.2.1/pjlib/src/pj/pool.c
index d3242237a3ae866d2283f2141b7438b9efbc750d..fbc6c1149fecd69b0abfd5660687ec9f1ad4699d 100644
--- a/daemon/libs/pjproject-2.2.1/pjlib/src/pj/pool.c
+++ b/daemon/libs/pjproject-2.2.1/pjlib/src/pj/pool.c
@@ -141,11 +141,7 @@ PJ_DEF(void*) pj_pool_allocate_find(pj_pool_t *pool, pj_size_t size)
 
     p = pj_pool_alloc_from_block(block, size);
     pj_assert(p != NULL);
-#if PJ_DEBUG
-    if (p == NULL) {
-	p = p;
-    }
-#endif
+
     return p;
 }
 
diff --git a/daemon/libs/pjproject-2.2.1/pjlib/src/pjlib-test/exception.c b/daemon/libs/pjproject-2.2.1/pjlib/src/pjlib-test/exception.c
index 4d4b1cd732edff966002d978abf7cb3490a953c3..d9953aeb3463e400823d297c147158ade7312aef 100644
--- a/daemon/libs/pjproject-2.2.1/pjlib/src/pjlib-test/exception.c
+++ b/daemon/libs/pjproject-2.2.1/pjlib/src/pjlib-test/exception.c
@@ -120,7 +120,7 @@ static int test(void)
      * No exception situation.
      */
     PJ_TRY {
-        rc = rc;
+        rc = 0;
     }
     PJ_CATCH_ANY {
         rc = -3;
diff --git a/daemon/libs/pjproject-2.2.1/pjmedia/src/pjmedia-codec/audio_codecs.c b/daemon/libs/pjproject-2.2.1/pjmedia/src/pjmedia-codec/audio_codecs.c
index 0c218213e193d451b9fd25f382539b1cfb1152ed..66ae236d3b3266aa2357b92c8319b2b4a62e1d6b 100644
--- a/daemon/libs/pjproject-2.2.1/pjmedia/src/pjmedia-codec/audio_codecs.c
+++ b/daemon/libs/pjproject-2.2.1/pjmedia/src/pjmedia-codec/audio_codecs.c
@@ -34,7 +34,9 @@ pjmedia_codec_register_audio_codecs(pjmedia_endpt *endpt,
                                     const pjmedia_audio_codec_config *c)
 {
     pjmedia_audio_codec_config default_cfg;
+#if PJMEDIA_HAS_PASSTHROUGH_CODECS
     pj_status_t status;
+#endif
 
     PJ_ASSERT_RETURN(endpt, PJ_EINVAL);
     if (!c) {
diff --git a/daemon/libs/pjproject-2.2.1/pjmedia/src/test/mips_test.c b/daemon/libs/pjproject-2.2.1/pjmedia/src/test/mips_test.c
index df68511bdeae13bd5fb88ff457cca27505c8eefb..5df6356b62596580fe9782295f8086524432bf27 100644
--- a/daemon/libs/pjproject-2.2.1/pjmedia/src/test/mips_test.c
+++ b/daemon/libs/pjproject-2.2.1/pjmedia/src/test/mips_test.c
@@ -682,7 +682,10 @@ struct codec_port
     pj_uint16_t	     pcm[32000 * PTIME / 1000];
 };
 
-
+#if PJMEDIA_HAS_L16_CODEC || \
+    PJMEDIA_HAS_OPENCORE_AMRWB_CODEC || PJMEDIA_HAS_OPENCORE_AMRNB_CODEC || \
+    PJMEDIA_HAS_G7221_CODEC || PJMEDIA_HAS_G722_CODEC || PJMEDIA_HAS_G711_CODEC || \
+    PJMEDIA_HAS_SPEEX_CODEC || PJMEDIA_HAS_ILBC_CODEC || PJMEDIA_HAS_GSM_CODEC
 static pj_status_t codec_put_frame(struct pjmedia_port *this_port, 
 				   pjmedia_frame *frame)
 {
@@ -792,6 +795,7 @@ static pjmedia_port* codec_encode_decode( pj_pool_t *pool,
 
     return &cp->base;
 }
+#endif
 
 #if PJMEDIA_HAS_G711_CODEC
 /* G.711 benchmark */
@@ -1696,6 +1700,10 @@ static void stream_port_custom_deinit(struct test_entry *te)
 
 }
 
+#if PJMEDIA_HAS_L16_CODEC || \
+    PJMEDIA_HAS_OPENCORE_AMRWB_CODEC || PJMEDIA_HAS_OPENCORE_AMRNB_CODEC || \
+    PJMEDIA_HAS_G7221_CODEC || PJMEDIA_HAS_G722_CODEC || PJMEDIA_HAS_G711_CODEC || \
+    PJMEDIA_HAS_SPEEX_CODEC || PJMEDIA_HAS_ILBC_CODEC || PJMEDIA_HAS_GSM_CODEC
 static pjmedia_port* create_stream( pj_pool_t *pool,
 				    const char *codec,
 				    pj_status_t (*codec_init)(pjmedia_endpt*),
@@ -1822,6 +1830,7 @@ static pjmedia_port* create_stream( pj_pool_t *pool,
 
     return port;
 }
+#endif
 
 #if PJMEDIA_HAS_G711_CODEC
 /* G.711 stream, no SRTP */