CMakeLists.txt

@@ -2,7 +2,7 @@ project(cellframe-sdk C)
 cmake_minimum_required(VERSION 2.8)
 
 set(CMAKE_C_STANDARD 11)
-set(CELLFRAME_SDK_NATIVE_VERSION "2.6-95")
+set(CELLFRAME_SDK_NATIVE_VERSION "2.6-97")
 add_definitions ("-DCELLFRAME_SDK_VERSION=\"${CELLFRAME_SDK_NATIVE_VERSION}\"")
 set(DAPSDK_MODULES "")
 

dap-sdk/core/libdap.pri

-QMAKE_CFLAGS_RELEASE += -std=gnu11
-QMAKE_CFLAGS_DEBUG = -std=gnu11
--DDAP_DEBUG
+#QMAKE_CFLAGS_RELEASE += -std=gnu11
+#QMAKE_CFLAGS_DEBUG = -std=gnu11 -DDAP_DEBUG
+#QMAKE_CFLAGS_RELEASE += -std=gnu1
+QMAKE_CFLAGS_DEBUG += -DDAP_DEBUG
 QMAKE_CXXFLAGS +=  -std=c++11
+QMAKE_CFLAGS +=  -std=gnu11
 unix {
     include(src/unix/unix.pri)
     DEFINES += DAP_OS_UNIX

dap-sdk/net/core/include/dap_events_socket.h

@@ -157,6 +157,8 @@ typedef struct dap_events_socket {
     u_int mq_num;
     u_short port;
     HANDLE ev_timeout, ev_recv;
+#else
+    };
 #endif
 
 #if defined DAP_EVENTS_CAPS_PIPE_POSIX

dap-sdk/net/core/include/dap_timerfd.h

@@ -33,7 +33,6 @@
 #elif defined DAP_OS_WINDOWS
 #define _MSEC -10000
 #endif
-#include <inttypes.h>
 
 #include "dap_common.h"
 #include "dap_events_socket.h"

modules/net/dap_chain_node_cli_cmd.c

@@ -2278,7 +2278,7 @@ int com_mempool_proc(int argc, char ** argv, void *arg_func, char ** a_str_reply
                 char buf[50];
                 time_t l_ts_create = (time_t) l_datum->header.ts_create;
                 const char *l_type = NULL;
-                DATUM_TYPE_STR(l_datum->header.type_id, l_type)
+                DAP_DATUM_TYPE_STR(l_datum->header.type_id, l_type);
                 dap_string_append_printf(l_str_tmp, "hash %s: type_id=%s ts_create=%s data_size=%u\n",
                         l_datum_hash_out_str, l_type,
                         dap_ctime_r(&l_ts_create, buf), l_datum->header.data_size);

modules/type/blocks/dap_chain_cs_blocks.c

@@ -513,7 +513,9 @@ static int s_cli_blocks(int a_argc, char ** a_argv, void *a_arg_func, char **a_s
                         time_t l_datum_ts_create = (time_t) l_datum->header.ts_create;
                         // Nested datums
                         dap_string_append_printf(l_str_tmp,"\t\t\t\tversion:=0x%02X\n", l_datum->header.version_id);
-                        dap_string_append_printf(l_str_tmp,"\t\t\t\ttype_id:=%s\n", c_datum_type_str[l_datum->header.type_id]);
+			const char * l_datum_type_str="UNKNOWN";
+			DAP_DATUM_TYPE_STR(l_datum->header.type_id, l_datum_type_str);
+                        dap_string_append_printf(l_str_tmp,"\t\t\t\ttype_id:=%s\n", l_datum_type_str);
                         dap_string_append_printf(l_str_tmp,"\t\t\t\tts_create=%s\n",ctime_r( &l_datum_ts_create,buf ));
                         dap_string_append_printf(l_str_tmp,"\t\t\t\tdata_size=%u\n", l_datum->header.data_size);
                         dap_chain_net_dump_datum(l_str_tmp, l_datum, "hex" );