From 787b6f0fbfe782e7d59ccf8a6d1b344f225aa7a7 Mon Sep 17 00:00:00 2001
From: Michael Cronenworth <mike@cchtml.com>
Date: Wed, 22 Jan 2020 16:32:29 -0600
Subject: [PATCH] More armv7hl gcc10 fixes

---
 wine-5.0-gcc10.patch | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/wine-5.0-gcc10.patch b/wine-5.0-gcc10.patch
index 5a0f801..915f0e0 100644
--- a/wine-5.0-gcc10.patch
+++ b/wine-5.0-gcc10.patch
@@ -187,3 +187,33 @@
  static const WCHAR installerW[] = {'\\','I','n','s','t','a','l','l','e','r',0};
  
  UINT msi_locate_product(LPCWSTR szProduct, MSIINSTALLCONTEXT *context)
+--- a/dlls/twain_32/twain_i.h	2020-01-21 11:03:21.000000000 -0600
++++ b/dlls/twain_32/twain_i.h	2020-01-22 16:29:07.623205272 -0600
+@@ -45,11 +45,11 @@
+     HWND                event_window;
+ } activeDS;
+ 
+-TW_UINT16 DSM_twCC DECLSPEC_HIDDEN;             /* current condition code of Source Manager */
++extern TW_UINT16 DSM_twCC DECLSPEC_HIDDEN;             /* current condition code of Source Manager */
+ 
+-activeDS *activeSources DECLSPEC_HIDDEN;	/* list of active data sources */
++extern activeDS *activeSources DECLSPEC_HIDDEN;	/* list of active data sources */
+ 
+-HINSTANCE DSM_hinstance DECLSPEC_HIDDEN;
++extern HINSTANCE DSM_hinstance DECLSPEC_HIDDEN;
+ 
+ /* Implementation of operation triplets (From Application to Source Manager) */
+ extern TW_UINT16 TWAIN_CloseDS
+--- a/dlls/twain_32/twain32_main.c	2020-01-22 16:31:43.494607403 -0600
++++ b/dlls/twain_32/twain32_main.c	2020-01-22 16:31:02.012503703 -0600
+@@ -29,6 +29,10 @@
+ 
+ WINE_DEFAULT_DEBUG_CHANNEL(twain);
+ 
++TW_UINT16 DSM_twCC;
++activeDS *activeSources;
++HINSTANCE DSM_hinstance;
++
+ BOOL WINAPI DllMain (HINSTANCE hinstance, DWORD reason, LPVOID reserved)
+ {
+     TRACE("%p,%x,%p\n", hinstance, reason, reserved);