From d45421d0e6503b3b3529611aafe762f04199f2fe Mon Sep 17 00:00:00 2001 From: Danny Al-Gaaf Date: Mon, 23 Apr 2018 23:11:02 +0200 Subject: [PATCH] rados/objclass.h: fix build define CEPH_CLS_API in all cases MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Fix for bug introduced with 096668ec5df93725a0726b53bbd30b4d4ab50f49: In file included from src/objclass/objclass.h:13:0, from src/cls/hello/cls_hello.cc:37: src/include/rados/objclass.h:31:1: error: ‘CEPH_CLS_API’ does not name a type; did you mean ‘CEPH_CAP_ANY’? CEPH_CLS_API void name##_cls_init() ^ /develop/ceph/source/ceph/src/include/rados/objclass.h:31:1: note: in definition of macro ‘CLS_INIT’ CEPH_CLS_API void name##_cls_init() ^~~~~~~~~~~~ Signed-off-by: Danny Al-Gaaf --- src/include/rados/objclass.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/include/rados/objclass.h b/src/include/rados/objclass.h index cd1432fcf52f0..d0e217e30681a 100644 --- a/src/include/rados/objclass.h +++ b/src/include/rados/objclass.h @@ -11,6 +11,8 @@ extern "C" { #endif +#define CEPH_CLS_API [[gnu::visibility("default")]] + #ifndef BUILDING_FOR_EMBEDDED #define CLS_VER(maj,min) \ int __cls_ver__## maj ## _ ##min = 0; \ @@ -21,7 +23,6 @@ int __cls_ver_min = min; int __cls_name__## name = 0; \ const char *__cls_name = #name; -#define CEPH_CLS_API [[gnu::visibility("default")]] #define CLS_INIT(name) \ CEPH_CLS_API void __cls_init() #else -- 2.39.5