Don't define llvm::X86Disassembler::InstructionSpecifier in different ways in

different source files.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@206719 91177308-0d34-0410-b5e6-96231b3b80d8

lib/Target/X86/Disassembler/X86DisassemblerDecoder.h

@@ -16,9 +16,6 @@
 #ifndef X86DISASSEMBLERDECODER_H
 #define X86DISASSEMBLERDECODER_H
 
-#define INSTRUCTION_SPECIFIER_FIELDS \
-  uint16_t operands;
-
 #define INSTRUCTION_IDS     \
   uint16_t instructionIDs;
 
@@ -531,6 +528,14 @@ typedef int (*byteReader_t)(const void* arg, uint8_t* byte, uint64_t address);
  */
 typedef void (*dlog_t)(void* arg, const char *log);
 
+/*
+ * The specification for how to extract and interpret a full instruction and
+ * its operands.
+ */
+struct InstructionSpecifier {
+  uint16_t operands;
+};
+
 /*
  * The x86 internal instruction, which is produced by the decoder.
  */