From 239499a56df7d656de6833ba107337e130269e20 Mon Sep 17 00:00:00 2001 From: Alexandre Julliard Date: Thu, 30 May 2019 09:11:23 +0200 Subject: [PATCH] d2d1: Build with msvcrt. Signed-off-by: Alexandre Julliard --- dlls/d2d1/Makefile.in | 2 ++ dlls/d2d1/bitmap.c | 3 --- dlls/d2d1/bitmap_render_target.c | 3 --- dlls/d2d1/brush.c | 3 --- dlls/d2d1/d2d1_private.h | 1 + dlls/d2d1/dc_render_target.c | 3 --- dlls/d2d1/device.c | 3 --- dlls/d2d1/effect.c | 3 --- dlls/d2d1/factory.c | 3 --- dlls/d2d1/geometry.c | 5 ----- dlls/d2d1/hwnd_render_target.c | 3 --- dlls/d2d1/layer.c | 3 --- dlls/d2d1/mesh.c | 3 --- dlls/d2d1/state_block.c | 3 --- dlls/d2d1/stroke.c | 3 --- dlls/d2d1/wic_render_target.c | 3 --- 16 files changed, 3 insertions(+), 44 deletions(-) diff --git a/dlls/d2d1/Makefile.in b/dlls/d2d1/Makefile.in index 413571338ba..c3af08ae79d 100644 --- a/dlls/d2d1/Makefile.in +++ b/dlls/d2d1/Makefile.in @@ -3,6 +3,8 @@ IMPORTLIB = d2d1 IMPORTS = d3d10_1 dxguid uuid gdi32 user32 advapi32 DELAYIMPORTS = dwrite +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ bitmap.c \ bitmap_render_target.c \ diff --git a/dlls/d2d1/bitmap.c b/dlls/d2d1/bitmap.c index c0aef3c0727..39e81192f77 100644 --- a/dlls/d2d1/bitmap.c +++ b/dlls/d2d1/bitmap.c @@ -16,9 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" - #include "d2d1_private.h" #include "wincodec.h" diff --git a/dlls/d2d1/bitmap_render_target.c b/dlls/d2d1/bitmap_render_target.c index 11c37882fce..373c3735664 100644 --- a/dlls/d2d1/bitmap_render_target.c +++ b/dlls/d2d1/bitmap_render_target.c @@ -17,9 +17,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" - #include "d2d1_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d2d); diff --git a/dlls/d2d1/brush.c b/dlls/d2d1/brush.c index dd3da32610b..21abf1456ab 100644 --- a/dlls/d2d1/brush.c +++ b/dlls/d2d1/brush.c @@ -16,9 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" - #include "d2d1_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d2d); diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index 70b841df8cb..b07893ae18c 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -24,6 +24,7 @@ #include #include +#include #define COBJMACROS #include "d2d1_2.h" #ifdef D2D1_INIT_GUID diff --git a/dlls/d2d1/dc_render_target.c b/dlls/d2d1/dc_render_target.c index b095008080d..310c5412967 100644 --- a/dlls/d2d1/dc_render_target.c +++ b/dlls/d2d1/dc_render_target.c @@ -17,9 +17,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" - #include "d2d1_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d2d); diff --git a/dlls/d2d1/device.c b/dlls/d2d1/device.c index 7c398962d6e..9e4acb6ea29 100644 --- a/dlls/d2d1/device.c +++ b/dlls/d2d1/device.c @@ -16,9 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" - #include "d2d1_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d2d); diff --git a/dlls/d2d1/effect.c b/dlls/d2d1/effect.c index cfb8255396a..fb1e66a3d9b 100644 --- a/dlls/d2d1/effect.c +++ b/dlls/d2d1/effect.c @@ -16,9 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" - #include "d2d1_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d2d); diff --git a/dlls/d2d1/factory.c b/dlls/d2d1/factory.c index c2a0405abdd..48a2efb96b8 100644 --- a/dlls/d2d1/factory.c +++ b/dlls/d2d1/factory.c @@ -16,9 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" - #define D2D1_INIT_GUID #include "d2d1_private.h" diff --git a/dlls/d2d1/geometry.c b/dlls/d2d1/geometry.c index 27281243776..91ce32c28e7 100644 --- a/dlls/d2d1/geometry.c +++ b/dlls/d2d1/geometry.c @@ -16,13 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" - #include "d2d1_private.h" -#ifdef HAVE_FLOAT_H #include -#endif WINE_DEFAULT_DEBUG_CHANNEL(d2d); diff --git a/dlls/d2d1/hwnd_render_target.c b/dlls/d2d1/hwnd_render_target.c index d0b96959338..625f101eaa7 100644 --- a/dlls/d2d1/hwnd_render_target.c +++ b/dlls/d2d1/hwnd_render_target.c @@ -17,9 +17,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" - #include "d2d1_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d2d); diff --git a/dlls/d2d1/layer.c b/dlls/d2d1/layer.c index 0f7ade24761..3eb2f3695d3 100644 --- a/dlls/d2d1/layer.c +++ b/dlls/d2d1/layer.c @@ -16,9 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" - #include "d2d1_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d2d); diff --git a/dlls/d2d1/mesh.c b/dlls/d2d1/mesh.c index ee53c699f7a..1e64a0ea165 100644 --- a/dlls/d2d1/mesh.c +++ b/dlls/d2d1/mesh.c @@ -16,9 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" - #include "d2d1_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d2d); diff --git a/dlls/d2d1/state_block.c b/dlls/d2d1/state_block.c index b15384e116b..e3175146a64 100644 --- a/dlls/d2d1/state_block.c +++ b/dlls/d2d1/state_block.c @@ -16,9 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" - #include "d2d1_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d2d); diff --git a/dlls/d2d1/stroke.c b/dlls/d2d1/stroke.c index 511c134f8c3..0ba44e0b1d0 100644 --- a/dlls/d2d1/stroke.c +++ b/dlls/d2d1/stroke.c @@ -16,9 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" - #include "d2d1_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d2d); diff --git a/dlls/d2d1/wic_render_target.c b/dlls/d2d1/wic_render_target.c index 21a1fa170e5..9b57a5d2c34 100644 --- a/dlls/d2d1/wic_render_target.c +++ b/dlls/d2d1/wic_render_target.c @@ -16,9 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" - #include "d2d1_private.h" #include "initguid.h" #include "wincodec.h"