From 5f658e50cd391db610f6e9d7cd894d2ba416e716 Mon Sep 17 00:00:00 2001
From: Dmitriy Gerasimov <dm@cifercom.com>
Date: Mon, 15 Jan 2018 03:45:16 +0700
Subject: [PATCH] [*] Fixes in include pathes
---
CMakeLists.txt | 2 +-
client/CMakeLists.txt | 2 +-
client/dap_client.c | 2 +-
client/dap_client_internal.c | 2 +-
core/dap_math_ops.h | 7 ++-----
5 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 77cbe49ea6..bf94f52701 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,8 +3,8 @@ cmake_minimum_required(VERSION 2.8)
add_subdirectory(core)
add_subdirectory(crypto)
-add_subdirectory(http)
add_subdirectory(client)
+add_subdirectory(http)
include_directories("${dap_core_INCLUDE_DIRS}")
include_directories("${dap_crypto_INCLUDE_DIRS}")
diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt
index c8a3bee84e..cf25b42609 100644
--- a/client/CMakeLists.txt
+++ b/client/CMakeLists.txt
@@ -7,7 +7,7 @@ add_library(${PROJECT_NAME} STATIC ${CLIENT_SRCS})
include_directories("${dap_core_INCLUDE_DIRS}")
include_directories("${dap_crypto_INCLUDE_DIRS}")
-include_directories("${dap_http_INCLUDE_DIRS}")
+#include_directories("${dap_http_INCLUDE_DIRS}")
add_definitions ("${dap_core_DEFINITIONS}")
add_definitions ("${dap_crypto_DEFINITIONS}")
add_definitions ("${dap_http_DEFINITIONS}")
diff --git a/client/dap_client.c b/client/dap_client.c
index a7aa519560..7c9f288314 100644
--- a/client/dap_client.c
+++ b/client/dap_client.c
@@ -2,7 +2,7 @@
#include "dap_common.h"
-#include "dap_http_client.h"
+#include "../http/dap_http_client.h"
#include "dap_client.h"
#include "dap_client_internal.h"
diff --git a/client/dap_client_internal.c b/client/dap_client_internal.c
index 3121f55919..536c43452b 100644
--- a/client/dap_client_internal.c
+++ b/client/dap_client_internal.c
@@ -8,7 +8,7 @@
#include "dap_enc.h"
#include "dap_common.h"
-#include "dap_http_client_simple.h"
+#include "../http/dap_http_client_simple.h"
#include "dap_client_internal.h"
#define LOG_TAG "dap_client_internal"
diff --git a/core/dap_math_ops.h b/core/dap_math_ops.h
index 5e90589443..1f13c9c435 100644
--- a/core/dap_math_ops.h
+++ b/core/dap_math_ops.h
@@ -1,8 +1,6 @@
-#ifndef _DAP_MATH_OPS_H_
-#define _DAP_MATH_OPS_H_
-
+#pragma once
#include <stdint.h>
-#include "common/int-util.h"
+//#include "common/int-util.h"
#if defined(__GNUC__) ||defined (__clang__)
@@ -21,4 +19,3 @@ typedef union dap_uint128{
#endif
} dap_uint128_t;
-#endif
--
GitLab