diff options
| author | Dimitri Staessens <dimitri@ouroboros.rocks> | 2019-08-27 19:12:07 +0200 |
|---|---|---|
| committer | Sander Vrijders <sander@ouroboros.rocks> | 2019-08-31 12:17:25 +0200 |
| commit | 63656e5c26c108263006695c5a77ae00e5bf26b1 (patch) | |
| tree | 14727d5459eba2547883cbfc1b3d043b2d2288ae | |
| parent | 4cb5f64cd5455f0b6a99bbfc7f6e36b1987a4007 (diff) | |
| download | ouroboros-63656e5c26c108263006695c5a77ae00e5bf26b1.tar.gz ouroboros-63656e5c26c108263006695c5a77ae00e5bf26b1.zip | |
tools: Use time_utils from tools
The ocbr tool was still using the non-public time_utils from the
library instead of the version in tools.
Signed-off-by: Dimitri Staessens <dimitri@ouroboros.rocks>
Signed-off-by: Sander Vrijders <sander@ouroboros.rocks>
| -rw-r--r-- | src/tools/ocbr/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | src/tools/ocbr/ocbr.c | 2 | ||||
| -rw-r--r-- | src/tools/ocbr/ocbr_client.c | 1 | ||||
| -rw-r--r-- | src/tools/ocbr/ocbr_server.c | 1 |
4 files changed, 7 insertions, 2 deletions
diff --git a/src/tools/ocbr/CMakeLists.txt b/src/tools/ocbr/CMakeLists.txt index 5dac3e63..f7ba66cd 100644 --- a/src/tools/ocbr/CMakeLists.txt +++ b/src/tools/ocbr/CMakeLists.txt @@ -4,6 +4,11 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) include_directories(${CMAKE_SOURCE_DIR}/include) include_directories(${CMAKE_BINARY_DIR}/include) +get_filename_component(CURRENT_SOURCE_PARENT_DIR + ${CMAKE_CURRENT_SOURCE_DIR} DIRECTORY) + +include_directories(${CURRENT_SOURCE_PARENT_DIR}) + set(SOURCE_FILES # Add source files here ocbr.c diff --git a/src/tools/ocbr/ocbr.c b/src/tools/ocbr/ocbr.c index 47ec5d53..814f6226 100644 --- a/src/tools/ocbr/ocbr.c +++ b/src/tools/ocbr/ocbr.c @@ -39,6 +39,8 @@ #define _POSIX_C_SOURCE 199506L #define __XSI_VISIBLE 500 +#include "time_utils.h" + #include <stdio.h> #include <string.h> #include <sys/time.h> diff --git a/src/tools/ocbr/ocbr_client.c b/src/tools/ocbr/ocbr_client.c index 8e319b2b..32554c38 100644 --- a/src/tools/ocbr/ocbr_client.c +++ b/src/tools/ocbr/ocbr_client.c @@ -37,7 +37,6 @@ */ #include <ouroboros/dev.h> -#include <ouroboros/time_utils.h> #include <signal.h> diff --git a/src/tools/ocbr/ocbr_server.c b/src/tools/ocbr/ocbr_server.c index 2fa9f142..0583f1d2 100644 --- a/src/tools/ocbr/ocbr_server.c +++ b/src/tools/ocbr/ocbr_server.c @@ -37,7 +37,6 @@ */ #include <ouroboros/dev.h> -#include <ouroboros/time_utils.h> #include <ouroboros/fccntl.h> #include <stdbool.h> |