Fix build break with gcc6x

Change-Id: I85cb07b5a73983bab8bce9e6fdd4f81c8af9c121
Signed-off-by: Jaehun Jeong <jh4u.jeong@samsung.com>

diff --git a/daemon/da_inst.c b/daemon/da_inst.c
index fdbcd0d..119f412 100644 (file)
--- a/daemon/da_inst.c
+++ b/daemon/da_inst.c
@@ -38,6 +38,8 @@
 #include "swap_debug.h"
 #include "daemon.h"
 
+#include "app_protocol.h" /* from swap-probe-devel package */
+
 #include "ld_preload_probes.h"
 
 struct lib_list_t *new_lib_inst_list = NULL;

diff --git a/daemon/da_protocol.h b/daemon/da_protocol.h
index 647849c..e2324be 100644 (file)
--- a/daemon/da_protocol.h
+++ b/daemon/da_protocol.h
@@ -414,25 +414,25 @@ struct recorded_event_t {
        uint32_t value;
 };
 
-#ifndef static_assert
-#define static_assert(cond) \
+#ifndef da_static_assert
+#define da_static_assert(cond) \
        char __attribute__((unused)) __static_assert[(cond) ? 1 : -1];
 #endif
 
 #define pack_int64(to, n) do {                                         \
-               static_assert(sizeof(n) == 8);                          \
+               da_static_assert(sizeof(n) == 8);                               \
                *(uint64_t *)to = (n);                                  \
                to += sizeof(uint64_t);                                 \
        } while (0)
 
 #define pack_int32(to, n) do {                                         \
-               static_assert(sizeof(n) == 4);                          \
+               da_static_assert(sizeof(n) == 4);                               \
                *(uint32_t *)to = (n);                                  \
                to += sizeof(uint32_t);                                 \
        } while (0)
 
 #define pack_int8(to, n) do {                                          \
-               static_assert(sizeof(n) == 1);                          \
+               da_static_assert(sizeof(n) == 1);                               \
                *(uint8_t *)to = (n);                                   \
                to += sizeof(uint8_t);                                  \
        } while (0)