diff --git a/CMakeLists.txt b/CMakeLists.txt
index fb42c1fbf8c522b2c6b77925cd028ce13ed82f60..200827637cb0ddedd8562308e44f9cf9b7c9dcbd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -13,3 +13,7 @@ endif()
 
 add_subdirectory(core)
 add_subdirectory(crypto)
+
+if(UNIX AND NOT APPLE)
+        set(LINUX TRUE)
+endif()
diff --git a/core/dap_common.h b/core/dap_common.h
index e6ae028bff15adcca6dca70a117dc056a2931478..1ee228c099cb2bba816530e05b0f75d63427ecf0 100644
--- a/core/dap_common.h
+++ b/core/dap_common.h
@@ -35,7 +35,7 @@
 #define DAP_DELETE(a)   free(a)
 #define DAP_DUP(a) (__typeof(a) ret = memcpy(ret,a,sizeof(*a)) )
 
-#define DAP_PROTOCOL_VERSION 21
+#define DAP_PROTOCOL_VERSION 22
 
 #if defined(__GNUC__) ||defined (__clang__)
 #define DAP_ALIGN_PACKED  __attribute__((aligned(1),packed))
diff --git a/crypto/dap_enc.h b/crypto/dap_enc.h
index 2e996330b9acd500f5bce18ce6a1892a851da49d..c0ea8a767d50c4fed2475c859b8b316b159b4aa8 100644
--- a/crypto/dap_enc.h
+++ b/crypto/dap_enc.h
@@ -36,11 +36,15 @@ void dap_enc_deinit(void);
 size_t dap_enc_code_out_size(dap_enc_key_t* a_key, const size_t a_buf_in_size, dap_enc_data_type_t type);
 size_t dap_enc_decode_out_size(dap_enc_key_t* a_key, const size_t a_buf_in_size, dap_enc_data_type_t type);
 
-size_t dap_enc_code(struct dap_enc_key * a_key, const void * a_buf_in, const size_t a_buf_in_size, void * a_buf_out, const size_t a_buf_out_size_max,
-                    dap_enc_data_type_t a_data_type_out);
-
-size_t dap_enc_decode(struct dap_enc_key * a_key, const void * a_buf_in, const size_t a_buf_in_size, void * a_buf_out, const size_t a_buf_out_size_max,
-                     dap_enc_data_type_t a_data_type_in);
+size_t dap_enc_code(struct dap_enc_key * a_key, // Key
+                    const void * a_buf_in, const size_t a_buf_in_size, // Input
+                    void * a_buf_out, const size_t a_buf_out_size_max, // Output
+                    dap_enc_data_type_t a_data_type_out); // Output data type
+
+size_t dap_enc_decode(struct dap_enc_key * a_key, // Key
+                      const void * a_buf_in, const size_t a_buf_in_size, // Input
+                      void * a_buf_out, const size_t a_buf_out_size_max, // Output
+                     dap_enc_data_type_t a_data_type_in); // Output data type
 
 #ifdef __cplusplus
 }