diff --git a/api/include/opentelemetry/common/macros.h b/api/include/opentelemetry/common/macros.h index 06f6360ec4..10e3b1d36d 100644 --- a/api/include/opentelemetry/common/macros.h +++ b/api/include/opentelemetry/common/macros.h @@ -7,6 +7,14 @@ #include "opentelemetry/version.h" +#ifndef likely +# ifdef __GNUC__ +# define likely(x) __builtin_expect(!!(x), 1) +# else +# define likely(x) !!(x) +# endif +#endif + /// \brief Declare variable as maybe unused /// usage: /// OPENTELEMETRY_MAYBE_UNUSED int a; diff --git a/exporters/otlp/src/otlp_log_recordable.cc b/exporters/otlp/src/otlp_log_recordable.cc index a5a7b10ccf..de9e74af5b 100644 --- a/exporters/otlp/src/otlp_log_recordable.cc +++ b/exporters/otlp/src/otlp_log_recordable.cc @@ -3,18 +3,12 @@ #ifdef ENABLE_LOGS_PREVIEW +# include "opentelemetry/common/macros.h" + # include "opentelemetry/exporters/otlp/otlp_log_recordable.h" # include "opentelemetry/exporters/otlp/otlp_recordable_utils.h" -# ifndef likely -# ifdef __GNUC__ -# define likely(x) __builtin_expect(!!(x), 1) -# else -# define likely(x) !!(x) -# endif -# endif - namespace nostd = opentelemetry::nostd; OPENTELEMETRY_BEGIN_NAMESPACE