util/perf: C++-proof util/perf

Signed-off-by: Danylo Piliaiev <dpiliaiev@igalia.com>
Reviewed-by: Jesse Natalie <jenatali@microsoft.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21931>

diff --git a/src/util/perf/cpu_trace.h b/src/util/perf/cpu_trace.h
index c13a382..bca056a 100644 (file)
--- a/src/util/perf/cpu_trace.h
+++ b/src/util/perf/cpu_trace.h
@@ -77,7 +77,7 @@ static inline void
 _mesa_trace_scope_end(int *scope)
 {
    /* we save the category in the scope variable */
-   _MESA_TRACE_END(*scope);
+   _MESA_TRACE_END((enum util_perfetto_category) *scope);
 }
 
 #else

diff --git a/src/util/perf/u_trace_priv.h b/src/util/perf/u_trace_priv.h
index 9804fa3..25dc07c 100644 (file)
--- a/src/util/perf/u_trace_priv.h
+++ b/src/util/perf/u_trace_priv.h
@@ -36,6 +36,10 @@
  * Internal interface used by generated tracepoints
  */
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * Tracepoint descriptor.
  */
@@ -71,6 +75,8 @@ u_trace_append(struct u_trace *ut, void *cs, const struct u_tracepoint *tp)
    return u_trace_appendv(ut, cs, tp, 0);
 }
 
-
+#ifdef __cplusplus
+}
+#endif
 
 #endif  /* _U_TRACE_PRIV_H */