diff options
| author | Dave Robillard <dave@drobilla.net> | 2009-06-19 21:01:54 -0400 |
|---|---|---|
| committer | Dave Robillard <dave@drobilla.net> | 2009-06-19 21:01:54 -0400 |
| commit | 925e83ee60c5406b2e5f0f39b0da0f90370efc27 (patch) | |
| tree | ce01d298ed0c5d31853fa43aedc2af0779417816 /gst/nsf/nes6502.c | |
| parent | 7f3bcd484b465d8216ac419754450adf07e9b0d2 (diff) | |
| parent | c70dbe94b5ff9a0993d852605d40c21020c59552 (diff) | |
| download | gst-plugins-bad-925e83ee60c5406b2e5f0f39b0da0f90370efc27.tar.gz gst-plugins-bad-925e83ee60c5406b2e5f0f39b0da0f90370efc27.tar.bz2 gst-plugins-bad-925e83ee60c5406b2e5f0f39b0da0f90370efc27.zip | |
Merge branch 'master' of git://anongit.freedesktop.org/gstreamer/gst-plugins-bad into fdo
Diffstat (limited to 'gst/nsf/nes6502.c')
| -rw-r--r-- | gst/nsf/nes6502.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gst/nsf/nes6502.c b/gst/nsf/nes6502.c index e2ed01f7..450350fc 100644 --- a/gst/nsf/nes6502.c +++ b/gst/nsf/nes6502.c @@ -944,7 +944,7 @@ ADD_CYCLES(cycles); \ } -#define SEC() \ +#define SEC_6502() \ { \ SET_FLAG(C_FLAG); \ ADD_CYCLES(2); \ @@ -1798,7 +1798,7 @@ nes6502_execute (int remaining_cycles) break; case 0x38: /* SEC */ - SEC (); + SEC_6502 (); break; case 0x39: /* AND $nnnn,Y */ |