From 94d52d2b28fe8ee49d81e4bb0538f59b9f6486d2 Mon Sep 17 00:00:00 2001 From: Nikolay Degterinsky Date: Tue, 14 Feb 2023 16:45:46 +0000 Subject: [PATCH] Fix include --- .gitmodules | 2 +- contrib/ulid-c | 2 +- contrib/ulid-c-cmake/CMakeLists.txt | 3 +-- src/Functions/generateULID.cpp | 2 +- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.gitmodules b/.gitmodules index a3e23a1529e..ca55281e643 100644 --- a/.gitmodules +++ b/.gitmodules @@ -298,7 +298,7 @@ url = https://github.com/ridiculousfish/libdivide [submodule "contrib/ulid-c"] path = contrib/ulid-c - url = https://github.com/evillique/ulid-c.git + url = https://github.com/ClickHouse/ulid-c.git [submodule "contrib/aws-crt-cpp"] path = contrib/aws-crt-cpp url = https://github.com/ClickHouse/aws-crt-cpp diff --git a/contrib/ulid-c b/contrib/ulid-c index 8b8bc280bc3..c433b6783cf 160000 --- a/contrib/ulid-c +++ b/contrib/ulid-c @@ -1 +1 @@ -Subproject commit 8b8bc280bc305f0d3dbdca49131677f2a208c48c +Subproject commit c433b6783cf918b8f996dacd014cb2b68c7de419 diff --git a/contrib/ulid-c-cmake/CMakeLists.txt b/contrib/ulid-c-cmake/CMakeLists.txt index 9a68e09faa2..3afbd965bac 100644 --- a/contrib/ulid-c-cmake/CMakeLists.txt +++ b/contrib/ulid-c-cmake/CMakeLists.txt @@ -8,8 +8,7 @@ endif() set (LIBRARY_DIR "${ClickHouse_SOURCE_DIR}/contrib/ulid-c") set (SRCS - "${LIBRARY_DIR}/include/ulid.h" - "${LIBRARY_DIR}/include/ulid.c" + "${LIBRARY_DIR}/src/ulid.c" ) add_library(_ulid ${SRCS}) diff --git a/src/Functions/generateULID.cpp b/src/Functions/generateULID.cpp index 46b8d190496..648754ddaa2 100644 --- a/src/Functions/generateULID.cpp +++ b/src/Functions/generateULID.cpp @@ -9,7 +9,7 @@ #include #include -#include +#include namespace DB