[sysprof: 4/4] Merge branch 'feature-flags' into 'master'

[Christian Hergert <chergert src gnome org>]

commit 39e6aeb2e00c451231e8c371c5ce970532ac1989
Merge: 100a4df 1c32c1e
Author: Christian Hergert <christian hergert me>
Date:   Mon Jul 6 13:42:58 2020 +0000

    Merge branch 'feature-flags' into 'master'
    
    Fix feature test macros when used as a subproject
    
    See merge request GNOME/sysprof!32

 meson.build                                           | 5 ++++-
 src/libsysprof-capture/sysprof-capture-writer.c       | 4 ----
 src/libsysprof-capture/sysprof-collector.c            | 4 ----
 src/libsysprof-capture/sysprof-macros-internal.h      | 2 ++
 src/libsysprof-ui/sysprof-details-page.c              | 4 ----
 src/libsysprof-ui/sysprof-profiler-assistant.c        | 4 ----
 src/libsysprof/preload/backtrace-helper.h             | 4 ----
 src/libsysprof/preload/sysprof-memory-collector.c     | 2 --
 src/libsysprof/preload/sysprof-speedtrack-collector.c | 2 --
 src/libsysprof/sysprof-kallsyms.c                     | 4 ----
 src/sysprofd/sysprof-turbostat.c                      | 2 --
 11 files changed, 6 insertions(+), 31 deletions(-)
---