From ad3c40cbd0dae8ab681fca364cb3b7f6699d3485 Mon Sep 17 00:00:00 2001 From: Ivan Molodetskikh Date: Wed, 4 Oct 2023 07:32:30 +0400 Subject: [PATCH] cogl: Replace HAVE_TRACING with COGL_HAS_TRACING The former was only used in the .c file, everything else uses the latter. Part-of: --- cogl/cogl-config.h.meson | 3 --- cogl/cogl/cogl-trace.c | 4 ++-- cogl/meson.build | 1 - 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/cogl/cogl-config.h.meson b/cogl/cogl-config.h.meson index 29ca42981..56946b299 100644 --- a/cogl/cogl-config.h.meson +++ b/cogl/cogl-config.h.meson @@ -4,9 +4,6 @@ /* Have GLES 2.0 for rendering */ #mesondefine HAVE_COGL_GLES2 -/* Building with Sysprof profiling support */ -#mesondefine HAVE_TRACING - /* Enable unit tests */ #mesondefine ENABLE_UNIT_TESTS diff --git a/cogl/cogl/cogl-trace.c b/cogl/cogl/cogl-trace.c index 1c7725b31..b4bc33452 100644 --- a/cogl/cogl/cogl-trace.c +++ b/cogl/cogl/cogl-trace.c @@ -29,7 +29,7 @@ #include "cogl/cogl-trace.h" -#ifdef HAVE_TRACING +#ifdef COGL_HAS_TRACING #include #include @@ -377,4 +377,4 @@ cogl_set_tracing_disabled_on_thread (void *data) fprintf (stderr, "Tracing not enabled"); } -#endif /* HAVE_TRACING */ +#endif /* COGL_HAS_TRACING */ diff --git a/cogl/meson.build b/cogl/meson.build index 7668c98e7..1fc26fe25 100644 --- a/cogl/meson.build +++ b/cogl/meson.build @@ -7,7 +7,6 @@ cogl_includepath = [mtk_includepath, include_directories('.', 'cogl')] cdata = configuration_data() cdata.set('HAVE_COGL_GL', have_gl) cdata.set('HAVE_COGL_GLES2', have_gles2) -cdata.set('HAVE_TRACING', have_profiler) cdata.set('ENABLE_UNIT_TESTS', have_cogl_tests) cogl_config_h = configure_file(