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

[Fabian Maurer]

From: Fabian Maurer

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

diff --git a/include/xact.h b/include/xact.h
index c6b34cc2c05..84d84a8bd31 100644
--- a/include/xact.h
+++ b/include/xact.h
@@ -82,11 +82,10 @@
     DEFINE_GUID(IID_IXACTEngine, 0x0aa000a0, 0xf404, 0x11d9, 0xbd, 0x7a, 0x00, 0x10, 0xdc, 0x4f, 0x8f, 0x81);
 #endif

-typedef struct IXACTSoundBank IXACTSoundBank;
-typedef struct IXACTWaveBank IXACTWaveBank;
-typedef struct IXACTCue IXACTCue;
-typedef struct IXACTWave IXACTWave;
-typedef struct IXACTEngine IXACTEngine;
+struct IXACTSoundBank;
+struct IXACTWaveBank;
+struct IXACTCue;
+struct IXACTWave;

typedef WORD XACTCATEGORY;
 typedef BYTE XACTCHANNEL;
@@ -404,8 +403,8 @@ typedef struct
 typedef struct XACT_NOTIFICATION_CUE
 {
     XACTINDEX cueIndex;
-    IXACTSoundBank *pSoundBank;
-    IXACTCue *pCue;
+    struct IXACTSoundBank *pSoundBank;
+    struct IXACTCue *pCue;
 } XACT_NOTIFICATION_CUE, *LPXACT_NOTIFICATION_CUE;
 typedef const XACT_NOTIFICATION_CUE *LPCXACT_NOTIFICATION_CUE;

@@ -413,11 +412,11 @@ typedef struct XACT_NOTIFICATION_DESCRIPTION
 {
     XACTNOTIFICATIONTYPE type;
     BYTE flags;
-    IXACTSoundBank *pSoundBank;
-    IXACTWaveBank *pWaveBank;
-    IXACTCue *pCue;
+    struct IXACTSoundBank *pSoundBank;
+    struct IXACTWaveBank *pWaveBank;
+    struct IXACTCue *pCue;
 #if XACT3_VER >= 0x0205
-    IXACTWave *pWave;
+    struct IXACTWave *pWave;
 #endif
     XACTINDEX cueIndex;
 #if XACT3_VER >= 0x0205
@@ -436,23 +435,23 @@ typedef const XACT_NOTIFICATION_GUI *LPCXACT_NOTIFICATION_GUI;
 typedef struct XACT_NOTIFICATION_MARKER
 {
     XACTINDEX cueIndex;
-    IXACTSoundBank *pSoundBank;
-    IXACTCue *pCue;
+    struct IXACTSoundBank *pSoundBank;
+    struct IXACTCue *pCue;
     DWORD marker;
 } XACT_NOTIFICATION_MARKER, *LPXACT_NOTIFICATION_MARKER;
 typedef const XACT_NOTIFICATION_MARKER *LPCXACT_NOTIFICATION_MARKER;

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

typedef struct XACT_NOTIFICATION_VARIABLE
 {
     XACTINDEX cueIndex;
-    IXACTSoundBank *pSoundBank;
-    IXACTCue *pCue;
+    struct IXACTSoundBank *pSoundBank;
+    struct IXACTCue *pCue;
     XACTVARIABLEINDEX variableIndex;
     XACTVARIABLEVALUE variableValue;
     BOOL local;
@@ -461,20 +460,20 @@ typedef const XACT_NOTIFICATION_VARIABLE *LPCXACT_NOTIFICATION_VARIABLE;

typedef struct XACT_NOTIFICATION_WAVE
 {
-    IXACTWaveBank *pWaveBank;
+    struct IXACTWaveBank *pWaveBank;
     XACTINDEX waveIndex;
     XACTINDEX cueIndex;
-    IXACTSoundBank *pSoundBank;
-    IXACTCue *pCue;
+    struct IXACTSoundBank *pSoundBank;
+    struct IXACTCue *pCue;
 #if XACT3_VER >= 0x0205
-    IXACTWave *pWave;
+    struct IXACTWave *pWave;
 #endif
 } XACT_NOTIFICATION_WAVE, *LPXACT_NOTIFICATION_WAVE;
 typedef const XACT_NOTIFICATION_WAVE *LPCXACT_NOTIFICATION_NAME;

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