gphoto2.ds: Global variable compatibility update for gcc 10.

Signed-off-by: Michael Cronenworth <mike@cchtml.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

gphoto2.ds: Global variable compatibility update for gcc 10.
453980e1 · Michael Cronenworth · Alexandre Julliard · bc51c5d5 · 453980e1 · 453980e1
Commit 453980e1 authored Jan 23, 2020 by Michael Cronenworth Committed by Alexandre Julliard Jan 27, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

gphoto2_i.h dlls/gphoto2.ds/gphoto2_i.h +3 -1

gphoto2_main.c dlls/gphoto2.ds/gphoto2_main.c +2 -0

No files found.
--- a/dlls/gphoto2.ds/gphoto2_i.h
+++ b/dlls/gphoto2.ds/gphoto2_i.h
@@ -100,7 +100,9 @@ struct tagActiveDS
    struct jpeg_decompress_struct	jd;
    struct jpeg_error_mgr		jerr;
 #endif
-} activeDS DECLSPEC_HIDDEN;
+};
+
+extern struct tagActiveDS activeDS DECLSPEC_HIDDEN;

 /* Helper functions */
 extern TW_UINT16 GPHOTO2_SaneCapability (pTW_CAPABILITY pCapability, TW_UINT16 action) DECLSPEC_HIDDEN;

--- a/dlls/gphoto2.ds/gphoto2_main.c
+++ b/dlls/gphoto2.ds/gphoto2_main.c
@@ -33,6 +33,8 @@

 WINE_DEFAULT_DEBUG_CHANNEL(twain);

+struct tagActiveDS activeDS;
+
 DSMENTRYPROC GPHOTO2_dsmentry;

 #ifdef HAVE_GPHOTO2