summaryrefslogtreecommitdiffstatshomepage
path: root/src/emu/emucore.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/emu/emucore.h')
-rw-r--r--src/emu/emucore.h42
1 files changed, 26 insertions, 16 deletions
diff --git a/src/emu/emucore.h b/src/emu/emucore.h
index 768fa8c7280..8074fb0fe73 100644
--- a/src/emu/emucore.h
+++ b/src/emu/emucore.h
@@ -13,35 +13,38 @@
#pragma once
-// standard C includes
-#include <cassert>
-#include <cmath>
-#include <cstdio>
-#include <cstring>
-#include <cstdlib>
-#include <cstdarg>
-
// some cleanups for Solaris for things defined in stdlib.h
#if defined(__sun__) && defined(__svr4__)
#undef si_status
#undef WWORD
#endif
-// standard C++ includes
-#include <exception>
-#include <string>
-#include <type_traits>
-#include <typeinfo>
+// centralised forward declarations
+#include "emufwd.h"
-// core system includes
-#include "osdcomm.h"
+// common stuff from lib/util
+#include "corealloc.h"
#include "coretmpl.h"
#include "bitmap.h"
#include "endianness.h"
#include "strformat.h"
#include "vecstream.h"
-#include "emufwd.h"
+// common stuff from osd
+#include "osdcomm.h"
+
+// standard C++ includes
+#include <exception>
+#include <string>
+#include <type_traits>
+#include <typeinfo>
+
+// standard C includes
+#include <cassert>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
//**************************************************************************
@@ -421,4 +424,11 @@ inline u64 d2u(double d)
return u.vv;
}
+
+//**************************************************************************
+// USEFUL UTILITIES
+//**************************************************************************
+
+using util::make_unique_clear;
+
#endif // MAME_EMU_EMUCORE_H