https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3d671fafe315f3307e4c4d...
commit 3d671fafe315f3307e4c4d136a7ee2bb423bf1f3 Author: winesync ros-dev@reactos.org AuthorDate: Sun Mar 13 19:08:13 2022 +0100 Commit: Mark Jansen mark.jansen@reactos.org CommitDate: Sun Mar 20 19:28:26 2022 +0100
[WINESYNC] msi: Properly declare variables in msi/tests/utils.h as extern.
Omitting the extern storage qualifier when declaring a global variable in a header file is mistake. If that header is included by several files it results in multiple definitions of the same variable (unless -fcommon is specified or assumed, the latter being the case for GCC 9.x and earlier).
This fixes building with GCC 10.
Signed-off-by: Gerald Pfeifer gerald@pfeifer.com Signed-off-by: Hans Leidekker hans@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
wine commit id ea032bb7f8daddfe308f86f52c54db5f657b658a by Gerald Pfeifer gerald@pfeifer.com --- modules/rostests/winetests/msi/utils.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/modules/rostests/winetests/msi/utils.h b/modules/rostests/winetests/msi/utils.h index f16e2d5ff56..0880553863e 100644 --- a/modules/rostests/winetests/msi/utils.h +++ b/modules/rostests/winetests/msi/utils.h @@ -16,12 +16,12 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-char PROG_FILES_DIR[MAX_PATH]; -char PROG_FILES_DIR_NATIVE[MAX_PATH]; -char COMMON_FILES_DIR[MAX_PATH]; -char APP_DATA_DIR[MAX_PATH]; -char WINDOWS_DIR[MAX_PATH]; -char CURR_DIR[MAX_PATH]; +extern char PROG_FILES_DIR[MAX_PATH]; +extern char PROG_FILES_DIR_NATIVE[MAX_PATH]; +extern char COMMON_FILES_DIR[MAX_PATH]; +extern char APP_DATA_DIR[MAX_PATH]; +extern char WINDOWS_DIR[MAX_PATH]; +extern char CURR_DIR[MAX_PATH];
BOOL get_system_dirs(void); BOOL get_user_dirs(void);