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 --- dlls/msi/tests/utils.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/dlls/msi/tests/utils.h b/dlls/msi/tests/utils.h index f16e2d5ff5..0880553863 100644 --- a/dlls/msi/tests/utils.h +++ b/dlls/msi/tests/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);
Hi,
While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check?
Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=64039
Your paranoid android.
=== w2003std (task log) ===
Task errors: The task timed out
=== wvistau64 (32 bit report) ===
msi: action: Timeout
=== wvistau64 (task log) ===
Task errors: The task timed out
=== w7u (32 bit report) ===
msi: action: Timeout
=== w1064v1809_ar (task log) ===
Task errors: The task timed out
=== w1064v1809_he (32 bit report) ===
msi: action: Timeout
=== w1064v1809_he (task log) ===
Task errors: The task timed out
=== w1064v1809_ja (task log) ===
Task errors: The task timed out
=== w1064v1809_zh_CN (task log) ===
Task errors: The task timed out
=== wvistau64 (64 bit report) ===
msi: action: Timeout
=== w2003std (task log) ===
Task errors: The task timed out
=== wvistau64 (32 bit report) ===
msi: install: Timeout
=== wvistau64 (task log) ===
Task errors: The task timed out
=== w7u (32 bit report) ===
msi: install: Timeout
=== w1064v1809_ar (32 bit report) ===
msi: install: Timeout
=== w1064v1809_ar (task log) ===
Task errors: The task timed out
=== w1064v1809_he (task log) ===
Task errors: The task timed out
=== w1064v1809_ja (32 bit report) ===
msi: install: Timeout
=== w1064v1809_ja (task log) ===
Task errors: The task timed out
=== w1064v1809_zh_CN (task log) ===
Task errors: The task timed out
=== wvistau64 (64 bit report) ===
msi: install: Timeout
=== w1064v1809_he (32 bit report) ===
msi: package: Timeout
=== w1064v1809_he (task log) ===
Task errors: The task timed out
On Wed, 29 Jan 2020, Marvin wrote:
While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check?
Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=64039
I don't see how my straightforward patch could be responsible for all those timeouts.
Some technical challenges on your side, Marvin? ;)
Gerald
On 1/29/20 9:50 AM, Gerald Pfeifer wrote:
On Wed, 29 Jan 2020, Marvin wrote:
While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check?
Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=64039
I don't see how my straightforward patch could be responsible for all those timeouts.
Some technical challenges on your side, Marvin? ;)
Gerald
The MSI tests often time out on Windows; it's a known problem.
-
Gerald Pfeifer -
Hans Leidekker -
Marvin -
Zebediah Figura