summaryrefslogtreecommitdiffstats
path: root/libcpu
diff options
context:
space:
mode:
authorUlf Hermann <ulf.hermann@qt.io>2017-02-16 18:51:09 +0100
committerUlf Hermann <ulf.hermann@qt.io>2017-04-21 15:21:03 +0000
commitf8b7e5a0cc31d2b101bc6be28842e37f2d14e81a (patch)
tree0f56440e934f24bdbbfb0e44922b7406f8439eca /libcpu
parent4bd80c4d123bdef4d06f0e116e59e24e45a51aff (diff)
Don't use comparison_fn_t
Not all search.h declare it, and it is not very helpful anyway. Change-Id: Icd3439175048b25058507dd5ec657b5680b82bb2 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'libcpu')
-rw-r--r--libcpu/ChangeLog4
-rw-r--r--libcpu/i386_parse.y4
2 files changed, 6 insertions, 2 deletions
diff --git a/libcpu/ChangeLog b/libcpu/ChangeLog
index 79110c22..e59e8762 100644
--- 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 15a72b1f..5fc06825 100644
--- 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;
}