Merge commit 'upstream/2.20'

[msp430-binutils.git] / include / opcode / tic54x.h

diff --git a/include/opcode/tic54x.h b/include/opcode/tic54x.h
index a37ae33a838d9e069f8550ddd6d112de694cdbbd..9a171b180af796afb278344f5b2948e0d04fc595 100644 (file)
--- a/include/opcode/tic54x.h
+++ b/include/opcode/tic54x.h
@@ -1,5 +1,5 @@
 /* tic54x.h -- Header file for TI TMS320C54X opcode table
-   Copyright 1999, 2000, 2001 Free Software Foundation, Inc.
+   Copyright 1999, 2000, 2001, 2005, 2009 Free Software Foundation, Inc.
    Written by Timothy Wall (twall@cygnus.com)
 
 This file is part of GDB, GAS, and the GNU binutils.
@@ -147,17 +147,17 @@ typedef struct _template
   const char* parname;
   enum optype paroperand_types[MAX_OPERANDS];
 
-} template;
+} insn_template;
 
-extern const template tic54x_unknown_opcode;
-extern const template tic54x_optab[];
-extern const template tic54x_paroptab[];
+extern const insn_template tic54x_unknown_opcode;
+extern const insn_template tic54x_optab[];
+extern const insn_template tic54x_paroptab[];
 extern const symbol mmregs[], regs[];
 extern const symbol condition_codes[], cc2_codes[], status_bits[];
 extern const symbol cc3_codes[];
 extern const char *misc_symbols[];
 struct disassemble_info;
-extern const template* tic54x_get_insn (struct disassemble_info *, 
+extern const insn_template* tic54x_get_insn (struct disassemble_info *, 
                                         bfd_vma, unsigned short, int *);
 
 #endif /* _opcode_tic54x_h_ */