From c4c36c82919b3136b9592db1f7872fc7d4907589 Mon Sep 17 00:00:00 2001 From: Wohlstand Date: Sun, 3 Jun 2018 14:39:05 +0300 Subject: Fix another conflict with Qt that was in NukedOPL3 1.7.4 --- src/chips/nuked/nukedopl3_174.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/chips/nuked/nukedopl3_174.h') 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]; -- cgit v1.2.3