From e1fab4a837e13dcebd76b35f364eb218d10dee7a Mon Sep 17 00:00:00 2001
From: Michael Stefaniuc <mstefani@redhat.de>
Date: Fri, 30 May 2014 23:03:53 +0200
Subject: [PATCH] dmscript: Move a struct definition to the .c file that uses
 it.

---
 dlls/dmscript/dmscript_private.h | 23 -----------------------
 dlls/dmscript/script.c           | 13 +++++++++++++
 2 files changed, 13 insertions(+), 23 deletions(-)

diff --git a/dlls/dmscript/dmscript_private.h b/dlls/dmscript/dmscript_private.h
index 082ffa4cacb..551e7b781a8 100644
--- a/dlls/dmscript/dmscript_private.h
+++ b/dlls/dmscript/dmscript_private.h
@@ -42,11 +42,6 @@
 #include "dmusicf.h"
 #include "dmusics.h"
 
-/*****************************************************************************
- * Interfaces
- */
-typedef struct IDirectMusicScriptImpl IDirectMusicScriptImpl;
-
 /*****************************************************************************
  * ClassFactory
  */
@@ -54,24 +49,6 @@ extern HRESULT WINAPI DMUSIC_CreateDirectMusicScriptImpl (LPCGUID lpcGUID, LPVOI
 
 extern HRESULT WINAPI DMUSIC_CreateDirectMusicScriptTrack (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) DECLSPEC_HIDDEN;
 
-/*****************************************************************************
- * IDirectMusicScriptImpl implementation structure
- */
-struct IDirectMusicScriptImpl {
-  IDirectMusicScript IDirectMusicScript_iface;
-  const IDirectMusicObjectVtbl *ObjectVtbl;
-  const IPersistStreamVtbl *PersistStreamVtbl;
-  LONG           ref;
-
-  /* IDirectMusicScriptImpl fields */
-  IDirectMusicPerformance* pPerformance;
-  LPDMUS_OBJECTDESC pDesc;
-  DMUS_IO_SCRIPT_HEADER* pHeader;
-  DMUS_IO_VERSION* pVersion;
-  WCHAR* pwzLanguage;
-  WCHAR* pwzSource;
-};
-
 /**********************************************************************
  * Dll lifetime tracking declaration for dmscript.dll
  */
diff --git a/dlls/dmscript/script.c b/dlls/dmscript/script.c
index 6b9be6fa95c..50394bc07a2 100644
--- a/dlls/dmscript/script.c
+++ b/dlls/dmscript/script.c
@@ -34,6 +34,19 @@ WINE_DECLARE_DEBUG_CHANNEL(dmfile);
 /*****************************************************************************
  * IDirectMusicScriptImpl implementation
  */
+typedef struct IDirectMusicScriptImpl {
+    IDirectMusicScript IDirectMusicScript_iface;
+    const IDirectMusicObjectVtbl *ObjectVtbl;
+    const IPersistStreamVtbl *PersistStreamVtbl;
+    LONG ref;
+    IDirectMusicPerformance *pPerformance;
+    DMUS_OBJECTDESC *pDesc;
+    DMUS_IO_SCRIPT_HEADER *pHeader;
+    DMUS_IO_VERSION *pVersion;
+    WCHAR *pwzLanguage;
+    WCHAR *pwzSource;
+} IDirectMusicScriptImpl;
+
 static inline IDirectMusicScriptImpl *impl_from_IDirectMusicScript(IDirectMusicScript *iface)
 {
   return CONTAINING_RECORD(iface, IDirectMusicScriptImpl, IDirectMusicScript_iface);