From: Ulf Hermann <ulf.hermann@qt.io>
Date: Thu, 20 Apr 2017 13:40:46 +0000 (+0200)
Subject: Don't use comparison_fn_t
X-Git-Tag: elfutils-0.169~20
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4159aa62cca90f4640784636dc7a3db07ef1133a;p=thirdparty%2Felfutils.git

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 79110c221..ec22dd2ee 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 15a72b1f0..5fc06825a 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;
 			    }