[cairo-commit] 2 commits - util/cairo-trace

[GitLab Mirror]

 util/cairo-trace/lookup-symbol.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 74f2da7b70179a363b5a4649b9c5d6fd18d9cbc0
Merge: 3bb33e164 24996e6ee
Author: Emmanuele Bassi <ebassi at gmail.com>
Date:   Thu Jul 14 10:41:29 2022 +0000

    Merge branch 'fix-build-with-newer-libbfd' into 'master'
    
    Fix build with newer binutils-dev installed
    
    Closes #581
    
    See merge request cairo/cairo!342

commit 24996e6ee241ebcd303dd34a2b06b37a6dd0c217
Author: Simon McVittie <smcv at debian.org>
Date:   Wed Jul 13 21:26:57 2022 +0100

    Fix build with newer binutils-dev installed
    
    It seems the PTR typedef (or macro?) has been removed from newer versions
    of libbfd.
    
    Resolves: https://gitlab.freedesktop.org/cairo/cairo/-/issues/581
    Signed-off-by: Simon McVittie <smcv at debian.org>

diff --git a/util/cairo-trace/lookup-symbol.c b/util/cairo-trace/lookup-symbol.c
index 3934066b9..ca15688c4 100644
--- a/util/cairo-trace/lookup-symbol.c
+++ b/util/cairo-trace/lookup-symbol.c
@@ -106,10 +106,10 @@ _symtab_init (struct symtab *symtab, const char *filename)
     if (! bfd_check_format_matches (symtab->bfd, bfd_object, &matching))
 	goto BAIL;
 
-    symcount = bfd_read_minisymbols (symtab->bfd, false, (PTR) &symtab->syms, &size);
+    symcount = bfd_read_minisymbols (symtab->bfd, false, (void **) &symtab->syms, &size);
     if (symcount == 0) {
 	symcount = bfd_read_minisymbols (symtab->bfd, true /* dynamic */ ,
-		(PTR) &symtab->syms, &size);
+		(void **) &symtab->syms, &size);
     }
     if (symcount < 0)
 	goto BAIL;