Michael Stefaniuc : dmscript: Move a struct definition to the .c file that uses it.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: e1fab4a837e13dcebd76b35f364eb218d10dee7a
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=e1fab4a837e13dcebd76b35f36...

Author: Michael Stefaniuc 
Date:   Fri May 30 23:03:53 2014 +0200

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 082ffa4..551e7b7 100644
--- a/dlls/dmscript/dmscript_private.h
+++ b/dlls/dmscript/dmscript_private.h
@@ -43,35 +43,12 @@
 #include "dmusics.h"

/*****************************************************************************
- * Interfaces
- */
-typedef struct IDirectMusicScriptImpl IDirectMusicScriptImpl;
-
-/*****************************************************************************
  * ClassFactory
  */
 extern HRESULT WINAPI DMUSIC_CreateDirectMusicScriptImpl (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) DECLSPEC_HIDDEN;

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 6b9be6f..50394bc 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);