[PATCH 7/8] xact3: Don't redefine interfaces (gcc 4.3)

[Fabian Maurer]

From: Fabian Maurer

Signed-off-by: Fabian Maurer 
---
 include/xact3.h | 41 ++++++++++++++++++++---------------------
 1 file changed, 20 insertions(+), 21 deletions(-)

diff --git a/include/xact3.h b/include/xact3.h
index 939a80e2af5..b888ad4b572 100644
--- a/include/xact3.h
+++ b/include/xact3.h
@@ -59,11 +59,10 @@ DEFINE_GUID(CLSID_XACTDebugEngine,    0x02860630, 0xbf3b, 0x42a8, 0xb1, 0x4e, 0x
     DEFINE_GUID(IID_IXACT3Engine, 0xb1ee676a, 0xd9cd, 0x4d2a, 0x89, 0xa8, 0xfa, 0x53, 0xeb, 0x9e, 0x48, 0x0b);
 #endif

-typedef struct IXACT3SoundBank IXACT3SoundBank;
-typedef struct IXACT3WaveBank  IXACT3WaveBank;
-typedef struct IXACT3Cue       IXACT3Cue;
-typedef struct IXACT3Wave      IXACT3Wave;
-typedef struct IXACT3Engine    IXACT3Engine;
+struct IXACT3SoundBank;
+struct IXACT3WaveBank;
+struct IXACT3Cue;
+struct IXACT3Wave;

typedef WORD  XACTCATEGORY;
 typedef BYTE  XACTCHANNEL;
@@ -336,10 +335,10 @@ typedef struct XACT_NOTIFICATION_DESCRIPTION
 {
     XACTNOTIFICATIONTYPE type;
     BYTE flags;
-    IXACT3SoundBank *pSoundBank;
-    IXACT3WaveBank *pWaveBank;
-    IXACT3Cue *pCue;
-    IXACT3Wave *pWave;
+    struct IXACT3SoundBank *pSoundBank;
+    struct IXACT3WaveBank *pWaveBank;
+    struct IXACT3Cue *pCue;
+    struct IXACT3Wave *pWave;
     XACTINDEX cueIndex;
     XACTINDEX waveIndex;
     void* pvContext;
@@ -349,37 +348,37 @@ typedef const XACT_NOTIFICATION_DESCRIPTION *LPCXACT_NOTIFICATION_DESCRIPTION;
 typedef struct XACT_NOTIFICATION_CUE
 {
     XACTINDEX cueIndex;
-    IXACT3SoundBank *pSoundBank;
-    IXACT3Cue *pCue;
+    struct IXACT3SoundBank *pSoundBank;
+    struct IXACT3Cue *pCue;
 } XACT_NOTIFICATION_CUE, *LPXACT_NOTIFICATION_CUE;
 typedef const XACT_NOTIFICATION_CUE *LPCXACT_NOTIFICATION_CUE;

typedef struct XACT_NOTIFICATION_MARKER
 {
     XACTINDEX cueIndex;
-    IXACT3SoundBank *pSoundBank;
-    IXACT3Cue *pCue;
+    struct IXACT3SoundBank *pSoundBank;
+    struct IXACT3Cue *pCue;
     DWORD marker;
 } XACT_NOTIFICATION_MARKER, *LPXACT_NOTIFICATION_MARKER;
 typedef const XACT_NOTIFICATION_MARKER *LPCXACT_NOTIFICATION_MARKER;

typedef struct XACT_NOTIFICATION_SOUNDBANK
 {
-    IXACT3SoundBank *pSoundBank;
+    struct IXACT3SoundBank *pSoundBank;
 } XACT_NOTIFICATION_SOUNDBANK, *LPXACT_NOTIFICATION_SOUNDBANK;
 typedef const XACT_NOTIFICATION_SOUNDBANK *LPCXACT_NOTIFICATION_SOUNDBANK;

typedef struct XACT_NOTIFICATION_WAVEBANK
 {
-    IXACT3WaveBank *pWaveBank;
+    struct IXACT3WaveBank *pWaveBank;
 } XACT_NOTIFICATION_WAVEBANK, *LPXACT_NOTIFICATION_WAVEBANK;
 typedef const XACT_NOTIFICATION_WAVEBANK *LPCXACT_NOTIFICATION_WAVEBANK;

typedef struct XACT_NOTIFICATION_VARIABLE
 {
     XACTINDEX cueIndex;
-    IXACT3SoundBank *pSoundBank;
-    IXACT3Cue *pCue;
+    struct IXACT3SoundBank *pSoundBank;
+    struct IXACT3Cue *pCue;
     XACTVARIABLEINDEX variableIndex;
     XACTVARIABLEVALUE variableValue;
     BOOL local;
@@ -394,12 +393,12 @@ typedef const XACT_NOTIFICATION_GUI *LPCXACT_NOTIFICATION_GUI;

typedef struct XACT_NOTIFICATION_WAVE
 {
-    IXACT3WaveBank *pWaveBank;
+    struct IXACT3WaveBank *pWaveBank;
     XACTINDEX waveIndex;
     XACTINDEX cueIndex;
-    IXACT3SoundBank *pSoundBank;
-    IXACT3Cue *pCue;
-    IXACT3Wave *pWave;
+    struct IXACT3SoundBank *pSoundBank;
+    struct IXACT3Cue *pCue;
+    struct IXACT3Wave *pWave;
 } XACT_NOTIFICATION_WAVE, *LPXACT_NOTIFICATION_WAVE;
 typedef const XACT_NOTIFICATION_WAVE *LPCXACT_NOTIFICATION_NAME;