Don't use comparison_fn_t

Not all search.h declare it, and it is not very helpful anyway.

Signed-off-by: Ulf Hermann <ulf.hermann@qt.io>

diff --git a/libcpu/ChangeLog b/libcpu/ChangeLog
index 79110c22135561f023ae7221b5c225fdd661d406..ec22dd2ee7be8dafd038a01811f5940b6d6f3b46 100644 (file)
--- a/libcpu/ChangeLog
+++ b/libcpu/ChangeLog
@@ -1,3 +1,7 @@
+2017-04-20  Ulf Hermann <ulf.hermann@qt.io>
+
+       * i386_parse.y: Eliminate comparison_fn_t.
+
 2016-11-02  Mark Wielaard  <mjw@redhat.com>
 
        * i386_disasm.c (i386_disasm): Add fallthrough comment.

diff --git a/libcpu/i386_parse.y b/libcpu/i386_parse.y
index 15a72b1f0da668369d54f70c581244d0c5cf47b5..5fc06825a33476378135edc3dce1c11608ace6e3 100644 (file)
--- a/libcpu/i386_parse.y
+++ b/libcpu/i386_parse.y
@@ -309,10 +309,10 @@ instr:              bytes ':' bitfieldopt kID bitfieldopt optargs
                          newp->mnemonic = $4;
                          if (newp->mnemonic != (void *) -1l
                              && tfind ($4, &mnemonics,
-                                       (comparison_fn_t) strcmp) == NULL)
+                                       (int (*)(const void *, const void *)) strcmp) == NULL)
                            {
                              if (tsearch ($4, &mnemonics,
-                                          (comparison_fn_t) strcmp) == NULL)
+                                          (int (*)(const void *, const void *)) strcmp) == NULL)
                                error (EXIT_FAILURE, errno, "tsearch");
                              ++nmnemonics;
                            }