sim: move MACH/MODEL types into SIM_xxx namespace

[thirdparty/binutils-gdb.git] / sim / common / sim-cpu.h

diff --git a/sim/common/sim-cpu.h b/sim/common/sim-cpu.h
index 18b9dc75151e4bf4d258e52b36e8256dfd3a9ac0..20838e876e54591f28ee03b2b80a2a7f89f2cc24 100644 (file)
--- a/sim/common/sim-cpu.h
+++ b/sim/common/sim-cpu.h
@@ -102,10 +102,10 @@ typedef struct {
 
 #ifdef SIM_HAVE_MODEL
   /* Machine tables for this cpu.  See sim-model.h.  */
-  const MACH *mach;
+  const SIM_MACH *mach;
 #define CPU_MACH(cpu) ((cpu)->base.mach)
   /* The selected model.  */
-  const MODEL *model;
+  const SIM_MODEL *model;
 #define CPU_MODEL(cpu) ((cpu)->base.model)
   /* Model data (profiling state, etc.).  */
   void *model_data;