diff options
author | Wohlstand <admin@wohlnet.ru> | 2018-06-03 14:39:05 +0300 |
---|---|---|
committer | Wohlstand <admin@wohlnet.ru> | 2018-06-03 14:39:05 +0300 |
commit | c4c36c82919b3136b9592db1f7872fc7d4907589 (patch) | |
tree | 1154f1157d21234256cfd3bdb3c9eaefdbd7cced /src/chips/nuked/nukedopl3_174.h | |
parent | 9ed43c5b909b1a0aafe16bbd431d6a90af3c9920 (diff) | |
download | libADLMIDI-c4c36c82919b3136b9592db1f7872fc7d4907589.tar.gz libADLMIDI-c4c36c82919b3136b9592db1f7872fc7d4907589.tar.bz2 libADLMIDI-c4c36c82919b3136b9592db1f7872fc7d4907589.zip |
Fix another conflict with Qt that was in NukedOPL3 1.7.4
Diffstat (limited to 'src/chips/nuked/nukedopl3_174.h')
-rw-r--r-- | src/chips/nuked/nukedopl3_174.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/chips/nuked/nukedopl3_174.h b/src/chips/nuked/nukedopl3_174.h index 43e4a6e..240802f 100644 --- a/src/chips/nuked/nukedopl3_174.h +++ b/src/chips/nuked/nukedopl3_174.h @@ -91,7 +91,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]; |