pcem: hide unused CPU catalog declarations

The embedded bridgeboard glue provides its own file-local CPU tables
and model_init() helper. The public PCem header declarations are not
used by the UAE integration, and some of the names collide with those
local definitions when compiled as C++.

Disable the unused declarations in the imported headers instead of
removing individual entries. This avoids mixed-linkage conflicts while
leaving the original declarations visible in the source for reference.

diff --git a/pcem/cpu.h b/pcem/cpu.h
index d4bea605fbac7f8559dc7444c2261ab531e2b0f4..b244dfe05fb6e7c9fe348ccf20c811a6d1f6bee1 100644 (file)
--- a/pcem/cpu.h
+++ b/pcem/cpu.h
@@ -104,6 +104,7 @@ typedef struct
 
 extern CPU *cpu_s;
 
+#if 0
 extern CPU cpus_8088[];
 extern CPU cpus_8086[];
 extern CPU cpus_286[];
@@ -138,6 +139,7 @@ extern CPU cpus_ibmxt286[];
 extern CPU cpus_ps1_m2011[];
 extern CPU cpus_ps2_m30_286[];
 extern CPU cpus_acer[];
+#endif
 
 extern int cpu_iscyrix;
 extern int cpu_16bitbus;

diff --git a/pcem/model.h b/pcem/model.h
index 5b1c9846afca9a230e577bc798519409060c1f37..eaaf666dc958501aa19132eb156e37bdf00fc19e 100644 (file)
--- a/pcem/model.h
+++ b/pcem/model.h
@@ -44,7 +44,9 @@ int model_getmodel(int romset);
 char *model_getname();
 char *model_get_internal_name();
 int model_get_model_from_internal_name(char *s);
+#if 0
 void model_init();
+#endif
 device_t *model_getdevice(int model);
 int model_has_fixed_gfx(int model);
 int model_has_optional_gfx(int model);