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

[Alexandre Julliard]

Module: wine
Branch: stable
Commit: 0c934a8474740126b79d2e8b028275d96a9e1ca9
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=0c934a8474740126b79d2e8b0...

Author: Michael Cronenworth 
Date:   Thu Jan 23 17:05:21 2020 -0600

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

Signed-off-by: Michael Cronenworth 
Signed-off-by: Alexandre Julliard 
(cherry picked from commit 453980e13015e20dd551531be69b3361b63f22b1)
Signed-off-by: Michael Stefaniuc

---

dlls/gphoto2.ds/gphoto2_i.h    | 4 +++-
 dlls/gphoto2.ds/gphoto2_main.c | 2 ++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/dlls/gphoto2.ds/gphoto2_i.h b/dlls/gphoto2.ds/gphoto2_i.h
index 9ab8bbbf33..4171fcae4f 100644
--- 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;
diff --git a/dlls/gphoto2.ds/gphoto2_main.c b/dlls/gphoto2.ds/gphoto2_main.c
index 28100414cc..4d71c89e2e 100644
--- 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