summaryrefslogtreecommitdiffstatshomepage
path: root/src
diff options
context:
space:
mode:
author Scott Stone <tafoid@gmail.com>2015-11-24 16:53:00 -0500
committer Scott Stone <tafoid@gmail.com>2015-11-24 16:53:00 -0500
commit0dc453ea69427ea7424a2c79c14d522e9a15aa29 (patch)
treef20aa40d19941d1ce8eb81d4f13fe845d2f05070 /src
parentc63af004ee28bdd110d69a34e91a98b9eba72b30 (diff)
parent7470f47f2304a1cf8efbfd7b83ed11c878da96dd (diff)
Merge branch 'master' of https://github.com/mamedev/mame
Diffstat (limited to 'src')
-rw-r--r--src/osd/modules/sound/js_sound.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/osd/modules/sound/js_sound.cpp b/src/osd/modules/sound/js_sound.cpp
index 103a20b799c..bd95c79dd2e 100644
--- a/src/osd/modules/sound/js_sound.cpp
+++ b/src/osd/modules/sound/js_sound.cpp
@@ -25,7 +25,7 @@ public:
}
virtual ~sound_js() { }
- virtual int init(const osd_options &options) { }
+ virtual int init(const osd_options &options) { return 0; }
virtual void exit() { }
// sound_module