[sysprof: 2/2] Merge branch 'master' into 'master'

[Christian Hergert <chergert src gnome org>]

commit 08a8423c413285e66e25321e4a8f70b26435cb0b
Merge: 013d2dc bc7e3e2
Author: Christian Hergert <christian hergert me>
Date:   Fri Sep 7 17:24:37 2018 +0000

    Merge branch 'master' into 'master'
    
    capture: use size of void* instead of glibc-specific __WORDSIZE
    
    See merge request GNOME/sysprof!5

 lib/capture/sp-capture-types.h | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
---