Skip to content

Commit 3d671fa

Browse files
winesynclearn-more
authored andcommitted
[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 <[email protected]> Signed-off-by: Hans Leidekker <[email protected]> Signed-off-by: Alexandre Julliard <[email protected]> wine commit id ea032bb7f8daddfe308f86f52c54db5f657b658a by Gerald Pfeifer <[email protected]>
1 parent 5741562 commit 3d671fa

File tree

1 file changed

+6
-6
lines changed
  • modules/rostests/winetests/msi

1 file changed

+6
-6
lines changed

modules/rostests/winetests/msi/utils.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@
1616
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
1717
*/
1818

19-
char PROG_FILES_DIR[MAX_PATH];
20-
char PROG_FILES_DIR_NATIVE[MAX_PATH];
21-
char COMMON_FILES_DIR[MAX_PATH];
22-
char APP_DATA_DIR[MAX_PATH];
23-
char WINDOWS_DIR[MAX_PATH];
24-
char CURR_DIR[MAX_PATH];
19+
extern char PROG_FILES_DIR[MAX_PATH];
20+
extern char PROG_FILES_DIR_NATIVE[MAX_PATH];
21+
extern char COMMON_FILES_DIR[MAX_PATH];
22+
extern char APP_DATA_DIR[MAX_PATH];
23+
extern char WINDOWS_DIR[MAX_PATH];
24+
extern char CURR_DIR[MAX_PATH];
2525

2626
BOOL get_system_dirs(void);
2727
BOOL get_user_dirs(void);

0 commit comments

Comments
 (0)