4 files changed, 1 insertions, 18 deletions
diff --git a/opcodes/arm-dis.c b/opcodes/arm-dis.c
index 7979987..4130919 100644
--- a/opcodes/arm-dis.c
+++ b/opcodes/arm-dis.c
@@ -39,11 +39,6 @@
 #include "elf/arm.h"
 #include "mach-o.h"
 
-/* FIXME: Belongs in global header.  */
-#ifndef strneq
-#define strneq(a,b,n)	(strncmp ((a), (b), (n)) == 0)
-#endif
-
 /* Cached mapping symbol state.  */
 enum map_type
 {
diff --git a/opcodes/cr16-dis.c b/opcodes/cr16-dis.c
index d5840cb..ac85552 100644
--- a/opcodes/cr16-dis.c
+++ b/opcodes/cr16-dis.c
@@ -800,7 +800,7 @@ print_insn_cr16 (bfd_vma memaddr, struct disassemble_info *info)
   /* If found, print the instruction's mnemonic and arguments.  */
   if (is_decoded > 0 && (cr16_words[0] != 0 || cr16_words[1] != 0))
     {
-      if (strneq (instruction->mnemonic, "cinv", 4))
+      if (startswith (instruction->mnemonic, "cinv"))
 	info->fprintf_func (info->stream,"%s",
 			    getcinvstring (instruction->mnemonic));
       else
diff --git a/opcodes/score-dis.c b/opcodes/score-dis.c
index c1b9227..3ec5c6a 100644
--- a/opcodes/score-dis.c
+++ b/opcodes/score-dis.c
@@ -477,14 +477,6 @@ static struct score_opcode score_opcodes[] =
 };
 
 
-#ifndef streq
-#define streq(a,b)    (strcmp ((a), (b)) == 0)
-#endif
-
-#ifndef strneq
-#define strneq(a,b,n)    (strncmp ((a), (b), (n)) == 0)
-#endif
-
 #ifndef NUM_ELEM
 #define NUM_ELEM(a)     (sizeof (a) / sizeof (a)[0])
 #endif
diff --git a/opcodes/score7-dis.c b/opcodes/score7-dis.c
index 5387307..6ffc7f6 100644
--- a/opcodes/score7-dis.c
+++ b/opcodes/score7-dis.c
@@ -37,10 +37,6 @@
 #define streq(a,b)    (strcmp ((a), (b)) == 0)
 #endif
 
-#ifndef strneq
-#define strneq(a,b,n)    (strncmp ((a), (b), (n)) == 0)
-#endif
-
 #ifndef NUM_ELEM
 #define NUM_ELEM(a)     (sizeof (a) / sizeof (a)[0])
 #endif