Alexandre Julliard : twain_32: Build with msvcrt.
Alexandre Julliard
julliard at winehq.org
Mon Jun 24 16:06:21 CDT 2019
Module: wine
Branch: master
Commit: 04eb97f9caaef57466fc7842ece01d6a3a9e5564
URL: https://source.winehq.org/git/wine.git/?a=commit;h=04eb97f9caaef57466fc7842ece01d6a3a9e5564
Author: Alexandre Julliard <julliard at winehq.org>
Date: Mon Jun 24 10:12:08 2019 +0200
twain_32: Build with msvcrt.
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/twain_32/Makefile.in | 2 ++
dlls/twain_32/dsm_ctrl.c | 2 --
dlls/twain_32/twain32_main.c | 2 --
dlls/twain_32/twain_i.h | 4 ----
4 files changed, 2 insertions(+), 8 deletions(-)
diff --git a/dlls/twain_32/Makefile.in b/dlls/twain_32/Makefile.in
index c82b5a7..6fb2126 100644
--- a/dlls/twain_32/Makefile.in
+++ b/dlls/twain_32/Makefile.in
@@ -1,6 +1,8 @@
MODULE = twain_32.dll
IMPORTS = user32
+EXTRADLLFLAGS = -mno-cygwin
+
C_SRCS = \
dsm_ctrl.c \
twain32_main.c
diff --git a/dlls/twain_32/dsm_ctrl.c b/dlls/twain_32/dsm_ctrl.c
index 0b20986..3f7ead4 100644
--- a/dlls/twain_32/dsm_ctrl.c
+++ b/dlls/twain_32/dsm_ctrl.c
@@ -19,8 +19,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "config.h"
-
#include <stdlib.h>
#include <stdarg.h>
#include <stdio.h>
diff --git a/dlls/twain_32/twain32_main.c b/dlls/twain_32/twain32_main.c
index 016680b..b1beb96 100644
--- a/dlls/twain_32/twain32_main.c
+++ b/dlls/twain_32/twain32_main.c
@@ -19,8 +19,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "config.h"
-
#include <stdarg.h>
#include "windef.h"
diff --git a/dlls/twain_32/twain_i.h b/dlls/twain_32/twain_i.h
index 4d33135..7939d23 100644
--- a/dlls/twain_32/twain_i.h
+++ b/dlls/twain_32/twain_i.h
@@ -20,10 +20,6 @@
#ifndef _TWAIN32_H
#define _TWAIN32_H
-#ifndef __WINE_CONFIG_H
-# error You must include config.h first
-#endif
-
#include <stdarg.h>
#include "windef.h"
More information about the wine-cvs
mailing list