[PATCH 03/12] gphoto2.ds: Global variable compatibility update for gcc 10
Michael Cronenworth
mike at cchtml.com
Thu Jan 23 17:05:21 CST 2020
https://gcc.gnu.org/gcc-10/porting_to.html#common
Signed-off-by: Michael Cronenworth <mike at cchtml.com>
---
dlls/gphoto2.ds/gphoto2_i.h | 2 +-
dlls/gphoto2.ds/gphoto2_main.c | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/dlls/gphoto2.ds/gphoto2_i.h b/dlls/gphoto2.ds/gphoto2_i.h
index 9ab8bbbf33..6b504821e0 100644
--- a/dlls/gphoto2.ds/gphoto2_i.h
+++ b/dlls/gphoto2.ds/gphoto2_i.h
@@ -100,7 +100,7 @@ struct tagActiveDS
struct jpeg_decompress_struct jd;
struct jpeg_error_mgr jerr;
#endif
-} activeDS DECLSPEC_HIDDEN;
+} extern 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
--
2.24.1
More information about the wine-devel
mailing list