Move likely into macros.h

Signed-off-by: owent <admin@owent.net>
open-telemetry · May 11, 2022 · 809e1eb · 809e1eb
1 parent 68d726d
commit 809e1eb
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git 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
@@ -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