summaryrefslogtreecommitdiffstatshomepage
path: root/src/emu
diff options
context:
space:
mode:
author Justin Kerk <dopefishjustin@gmail.com>2019-08-08 14:23:12 +0000
committer Justin Kerk <dopefishjustin@gmail.com>2019-08-08 14:23:12 +0000
commit490709a6c1513da1365db30cd661c6b40a7fa008 (patch)
tree43bd36c739b2d386263fc5fd15971fe4056b591f /src/emu
parent2e2ee0ee6a5aeed9a3dc512797ad020c309a7f0d (diff)
Fix build in newer Emscripten versions (nw)
Diffstat (limited to 'src/emu')
-rw-r--r--src/emu/machine.cpp8
-rw-r--r--src/emu/machine.h2
2 files changed, 5 insertions, 5 deletions
diff --git a/src/emu/machine.cpp b/src/emu/machine.cpp
index 054b4d9f057..3591dc49a14 100644
--- a/src/emu/machine.cpp
+++ b/src/emu/machine.cpp
@@ -88,7 +88,7 @@
#include <rapidjson/writer.h>
#include <rapidjson/stringbuffer.h>
-#if defined(EMSCRIPTEN)
+#if defined(__EMSCRIPTEN__)
#include <emscripten.h>
#endif
@@ -340,7 +340,7 @@ int running_machine::run(bool quiet)
m_hard_reset_pending = false;
-#if defined(EMSCRIPTEN)
+#if defined(__EMSCRIPTEN__)
// break out to our async javascript loop and halt
emscripten_set_running_machine(this);
#endif
@@ -1354,7 +1354,7 @@ device_memory_interface::space_config_vector dummy_space_device::memory_space_co
// JAVASCRIPT PORT-SPECIFIC
//**************************************************************************
-#if defined(EMSCRIPTEN)
+#if defined(__EMSCRIPTEN__)
running_machine * running_machine::emscripten_running_machine;
@@ -1439,4 +1439,4 @@ void running_machine::emscripten_load(const char *name) {
emscripten_running_machine->schedule_load(name);
}
-#endif /* defined(EMSCRIPTEN) */
+#endif /* defined(__EMSCRIPTEN__) */
diff --git a/src/emu/machine.h b/src/emu/machine.h
index 88132ef8f2d..2d1c8fe2613 100644
--- a/src/emu/machine.h
+++ b/src/emu/machine.h
@@ -396,7 +396,7 @@ private:
// configuration state
dummy_space_device m_dummy_space;
-#if defined(EMSCRIPTEN)
+#if defined(__EMSCRIPTEN__)
private:
static running_machine *emscripten_running_machine;
static void emscripten_main_loop();