From eb3f949411d5e67bd8b264154ad83b23e71530f1 Mon Sep 17 00:00:00 2001 From: VitaliyaIoffe <vitaioffe@yandex.ru> Date: Thu, 24 Jun 2021 10:17:15 +0300 Subject: [PATCH] error: change file macro to path Due to a build is going as out-of-source after the patch 781fd38, where was deleted the path of a source dir, macro __FILE__ leads to the compilation fail on ubuntu_21_04. Change __FILE__ to the file path. Needed for: #5825 --- src/box/mp_error.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/box/mp_error.cc b/src/box/mp_error.cc index 36fbcefc50..52c7a210b3 100644 --- a/src/box/mp_error.cc +++ b/src/box/mp_error.cc @@ -582,7 +582,7 @@ error_unpack_unsafe(const char **data) #define MP_PRINT_2(total, func, ...) \ SNPRINT(total, func, buf, size, __VA_ARGS__) #define MP_PRINT_ARGS_DECL char *buf, int size -#include __FILE__ +#include "box/mp_error.cc" #define MP_ERROR_PRINT_DEFINITION #define MP_PRINT_FUNC fprintf @@ -594,7 +594,7 @@ error_unpack_unsafe(const char **data) total += bytes; \ } while (0) #define MP_PRINT_ARGS_DECL FILE *file -#include __FILE__ +#include "box/mp_error.cc" /* !defined(MP_ERROR_PRINT_DEFINITION) */ #else -- GitLab