diff options
| author | dcherednik <[email protected]> | 2023-03-30 11:11:12 +0300 |
|---|---|---|
| committer | dcherednik <[email protected]> | 2023-03-30 11:11:12 +0300 |
| commit | 215150b85af0221f3ccf0e8681f8adef1efe6ca9 (patch) | |
| tree | 57ff98f0d6a8287803b5b3b75c64fec41c1a4b86 | |
| parent | 1592fa9e7e78df883602d535f7aac49f0ab063a6 (diff) | |
Fix "'RWF_APPEND' macro redefined" warning.
| -rw-r--r-- | ydb/library/pdisk_io/aio_linux.cpp | 2 | ||||
| -rw-r--r-- | ydb/library/pdisk_io/file_params_linux.cpp | 13 |
2 files changed, 14 insertions, 1 deletions
diff --git a/ydb/library/pdisk_io/aio_linux.cpp b/ydb/library/pdisk_io/aio_linux.cpp index f95655a78a8..07cb1c1ac81 100644 --- a/ydb/library/pdisk_io/aio_linux.cpp +++ b/ydb/library/pdisk_io/aio_linux.cpp @@ -11,6 +11,8 @@ #include <util/system/file.h> #include <util/stream/format.h> +#undef RWF_APPEND + #include <liburing.h> #include <libaio.h> #include <linux/fs.h> diff --git a/ydb/library/pdisk_io/file_params_linux.cpp b/ydb/library/pdisk_io/file_params_linux.cpp index 31de67b65e3..98c2ee62e5d 100644 --- a/ydb/library/pdisk_io/file_params_linux.cpp +++ b/ydb/library/pdisk_io/file_params_linux.cpp @@ -5,13 +5,24 @@ #include <ydb/library/pdisk_io/aio.h> #include <ydb/library/pdisk_io/wcache.h> -#include <linux/fs.h> #include <regex> + +#ifdef RWF_APPEND +static constexpr ui64 RWFAppendCheck = (ui64)RWF_APPEND; +#define NEED_CHECK +#undef RWF_APPEND +#endif + +#include <linux/fs.h> #include <sys/ioctl.h> #include <sys/stat.h> #include <sys/types.h> #include <unistd.h> +#ifdef NEED_CHECK +static_assert(RWFAppendCheck == (ui64)RWF_APPEND); +#endif + namespace NKikimr { void DetectFileParameters(TString path, ui64 &outDiskSizeBytes, bool &outIsBlockDevice) { |