diff options
author | 2016-03-12 12:31:13 +0100 | |
---|---|---|
committer | 2016-03-12 12:31:13 +0100 | |
commit | a026a582f1a0ea8c1ede3acaddacef506ef3f3b0 (patch) | |
tree | e31573822f2359677de519f9f3b600d98e8764cd /src/devices/machine/74123.cpp | |
parent | 477d2abd43984f076b7e45f5527591fa8fd0d241 (diff) | |
parent | dcab55bf53b94713a6f72e9633f5101c8dd6c08c (diff) |
Merge pull request #15 from mamedev/master
Sync to base master
Diffstat (limited to 'src/devices/machine/74123.cpp')
-rw-r--r-- | src/devices/machine/74123.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/devices/machine/74123.cpp b/src/devices/machine/74123.cpp index d5eddbe91a3..0263ad0eb4b 100644 --- a/src/devices/machine/74123.cpp +++ b/src/devices/machine/74123.cpp @@ -116,7 +116,7 @@ int ttl74123_device::timer_running() /*------------------------------------------------- - TIMER_CALLBACK( output_callback ) + TIMER_CALLBACK_MEMBER( output_callback ) -------------------------------------------------*/ TIMER_CALLBACK_MEMBER( ttl74123_device::output_callback ) @@ -140,7 +140,7 @@ void ttl74123_device::set_output() /*------------------------------------------------- - TIMER_CALLBACK( clear_callback ) + TIMER_CALLBACK_MEMBER( clear_callback ) -------------------------------------------------*/ TIMER_CALLBACK_MEMBER( ttl74123_device::clear_callback ) |