aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/vnet/session/application.c2
-rw-r--r--src/vppinfra/dlmalloc.c3
2 files changed, 3 insertions, 2 deletions
diff --git a/src/vnet/session/application.c b/src/vnet/session/application.c
index 806e390d311..99f0dff7fab 100644
--- a/src/vnet/session/application.c
+++ b/src/vnet/session/application.c
@@ -877,7 +877,7 @@ app_send_io_evt_rx (application_t * app, stream_session_t * s, u8 lock)
if (app_enqueue_evt (mq, &msg, lock))
return -1;
- svm_fifo_set_event (s->server_rx_fifo);
+ (void) svm_fifo_set_event (s->server_rx_fifo);
return 0;
}
diff --git a/src/vppinfra/dlmalloc.c b/src/vppinfra/dlmalloc.c
index e5bd1e8a899..8ae92cf566c 100644
--- a/src/vppinfra/dlmalloc.c
+++ b/src/vppinfra/dlmalloc.c
@@ -1745,6 +1745,7 @@ static int init_mparams(void) {
#endif
{
+#ifndef DLM_MAGIC_CONSTANT
#if USE_DEV_RANDOM
int fd;
unsigned char buf[sizeof(size_t)];
@@ -1765,7 +1766,7 @@ static int init_mparams(void) {
#endif
magic |= (size_t)8U; /* ensure nonzero */
magic &= ~(size_t)7U; /* improve chances of fault for bad values */
-#ifdef DLM_MAGIC_CONSTANT
+#else
magic = DLM_MAGIC_CONSTANT;
#endif
/* Until memory modes commonly available, use volatile-write */