From 453980e13015e20dd551531be69b3361b63f22b1 Mon Sep 17 00:00:00 2001 From: Michael Cronenworth Date: Thu, 23 Jan 2020 17:05:21 -0600 Subject: [PATCH] gphoto2.ds: Global variable compatibility update for gcc 10. Signed-off-by: Michael Cronenworth Signed-off-by: Alexandre Julliard --- 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 9ab8bbbf33b..4171fcae4f4 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 28100414cc7..4d71c89e2e2 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