Module: wine Branch: master Commit: ca49f8f12016a2511ab109218839d07b6eefcc98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca49f8f12016a2511ab1092188...
Author: Henri Verbeet hverbeet@codeweavers.com Date: Thu Nov 10 16:17:41 2016 +0100
d3drm: Don't import libdxguid and libuuid.
Signed-off-by: Henri Verbeet hverbeet@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/d3drm/Makefile.in | 2 +- dlls/d3drm/d3drm.c | 7 ++----- dlls/d3drm/d3drm_main.c | 8 ++------ dlls/d3drm/d3drm_private.h | 1 + dlls/d3drm/meshbuilder.c | 1 - 5 files changed, 6 insertions(+), 13 deletions(-)
diff --git a/dlls/d3drm/Makefile.in b/dlls/d3drm/Makefile.in index 5db3494..f75a14b 100644 --- a/dlls/d3drm/Makefile.in +++ b/dlls/d3drm/Makefile.in @@ -1,6 +1,6 @@ MODULE = d3drm.dll IMPORTLIB = d3drm -IMPORTS = dxguid uuid d3dxof ddraw +IMPORTS = d3dxof ddraw
C_SRCS = \ d3drm.c \ diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c index c7c28b9..260cc7d 100644 --- a/dlls/d3drm/d3drm.c +++ b/dlls/d3drm/d3drm.c @@ -20,11 +20,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#include "wine/debug.h" - -#include "winbase.h" -#include "wingdi.h" -#include "rmxfguid.h" +#include "config.h" +#include "wine/port.h"
#include "d3drm_private.h"
diff --git a/dlls/d3drm/d3drm_main.c b/dlls/d3drm/d3drm_main.c index 67d1ad1..9fbd8d5 100644 --- a/dlls/d3drm/d3drm_main.c +++ b/dlls/d3drm/d3drm_main.c @@ -17,15 +17,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#include <stdarg.h> -#include "d3d.h" +#include "config.h" +#include "wine/port.h"
-#include "dxfile.h" #include "initguid.h" -#include "d3drm.h" - #include "d3drm_private.h" -#include "wine/list.h"
/*********************************************************************** * DllMain (D3DRM.@) diff --git a/dlls/d3drm/d3drm_private.h b/dlls/d3drm/d3drm_private.h index 8419046..666a74c 100644 --- a/dlls/d3drm/d3drm_private.h +++ b/dlls/d3drm/d3drm_private.h @@ -29,6 +29,7 @@ #include "d3drm.h" #include "dxfile.h" #include "d3drmwin.h" +#include "rmxfguid.h" #include "wine/debug.h" #include "wine/list.h"
diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index e873d33..4d5a2a7 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -23,7 +23,6 @@ #include "wine/port.h"
#include "d3drm_private.h" -#include "rmxfguid.h"
WINE_DEFAULT_DEBUG_CHANNEL(d3drm);