diff options
| author | Vitaly Novichkov <admin@wohlnet.ru> | 2018-06-19 15:04:50 +0300 |
|---|---|---|
| committer | Vitaly Novichkov <admin@wohlnet.ru> | 2018-06-19 15:04:50 +0300 |
| commit | c0873278718da57ff19194377a35601027926c5f (patch) | |
| tree | 6fca461d067a1e615788cecf7a74c175f0033fc8 /src/chips/nuked/nukedopl3.h | |
| parent | 5a194eb263125e5505cca3ec0256c7efa348eaa4 (diff) | |
| parent | 1026ecd3fd8dc865fb3a85ab4a130d9d1b494fd9 (diff) | |
| download | libADLMIDI-c0873278718da57ff19194377a35601027926c5f.tar.gz libADLMIDI-c0873278718da57ff19194377a35601027926c5f.tar.bz2 libADLMIDI-c0873278718da57ff19194377a35601027926c5f.zip | |
Merge branch 'master' into stable
Diffstat (limited to 'src/chips/nuked/nukedopl3.h')
| -rw-r--r-- | src/chips/nuked/nukedopl3.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/chips/nuked/nukedopl3.h b/src/chips/nuked/nukedopl3.h index ce748b1..d57cf5f 100644 --- a/src/chips/nuked/nukedopl3.h +++ b/src/chips/nuked/nukedopl3.h @@ -86,7 +86,7 @@ struct _opl3_slot { }; struct _opl3_channel { - opl3_slot *slots[2]; + opl3_slot *slotz[2];/*Don't use "slots" keyword to avoid conflict with Qt applications*/ opl3_channel *pair; opl3_chip *chip; Bit16s *out[4]; |