marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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>
(cherry picked from commit 453980e130)
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
stable
Michael Cronenworth 2020-01-23 17:05:21 -06:00 committed by Michael Stefaniuc
parent 8405a5ebba
commit 0c934a8474
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dlls/gphoto2.ds/gphoto2_i.h
View File

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

2
dlls/gphoto2.ds/gphoto2_main.c
View File

@ -33,6 +33,8 @@
WINE_DEFAULT_DEBUG_CHANNEL(twain);
struct tagActiveDS activeDS;
DSMENTRYPROC GPHOTO2_dsmentry;
#ifdef HAVE_GPHOTO2