More armv7hl gcc10 fixes

f38
Michael Cronenworth 5 years ago
parent 112955dc9e
commit 787b6f0fbf

@ -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);

Loading…
Cancel
Save