diff options
| author | Casey Bodley <cbodley@redhat.com> | 2023-03-10 22:24:59 +0100 |
|---|---|---|
| committer | Casey Bodley <cbodley@redhat.com> | 2023-03-22 18:26:19 +0100 |
| commit | d4ae3d0db857766ba38656d2c5c523883e518879 (patch) | |
| tree | ddbd1fc1e959d204065d9b4b603effe21d08c1eb /src/cls | |
| parent | Merge pull request #50510 from cbodley/wip-rgw-server-name (diff) | |
| download | ceph-d4ae3d0db857766ba38656d2c5c523883e518879.tar.xz ceph-d4ae3d0db857766ba38656d2c5c523883e518879.zip | |
fmt: remove FMT_HEADER_ONLY defines
a WITH_FMT_HEADER_ONLY cmake option controls which version of the
library to use. individual sources/targets shouldn't override that, or
they'll end up including/linking against both versions
Fixes: https://tracker.ceph.com/issues/58953
Signed-off-by: Casey Bodley <cbodley@redhat.com>
Diffstat (limited to 'src/cls')
| -rw-r--r-- | src/cls/fifo/cls_fifo.cc | 2 | ||||
| -rw-r--r-- | src/cls/fifo/cls_fifo_types.h | 2 | ||||
| -rw-r--r-- | src/cls/rgw/cls_rgw_types.h | 2 |
3 files changed, 0 insertions, 6 deletions
diff --git a/src/cls/fifo/cls_fifo.cc b/src/cls/fifo/cls_fifo.cc index 3cbb4636c9d..85022eeb061 100644 --- a/src/cls/fifo/cls_fifo.cc +++ b/src/cls/fifo/cls_fifo.cc @@ -12,8 +12,6 @@ #include <optional> #include <string> -#undef FMT_HEADER_ONLY -#define FMT_HEADER_ONLY 1 #include <fmt/format.h> #include "include/buffer.h" diff --git a/src/cls/fifo/cls_fifo_types.h b/src/cls/fifo/cls_fifo_types.h index 2b9fec26af9..1c69c1f0871 100644 --- a/src/cls/fifo/cls_fifo_types.h +++ b/src/cls/fifo/cls_fifo_types.h @@ -25,8 +25,6 @@ #include <boost/container/flat_set.hpp> -#undef FMT_HEADER_ONLY -#define FMT_HEADER_ONLY 1 #include <fmt/format.h> #if FMT_VERSION >= 90000 #include <fmt/ostream.h> diff --git a/src/cls/rgw/cls_rgw_types.h b/src/cls/rgw/cls_rgw_types.h index c65526c06c5..37a06defc31 100644 --- a/src/cls/rgw/cls_rgw_types.h +++ b/src/cls/rgw/cls_rgw_types.h @@ -9,8 +9,6 @@ #include "common/ceph_time.h" #include "common/Formatter.h" -#undef FMT_HEADER_ONLY -#define FMT_HEADER_ONLY 1 #include <fmt/format.h> #include "rgw/rgw_basic_types.h" |