From 4d61dd5abf517e5f2be3607ca9aa5d09c4358790 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Date: Fri, 24 Jan 2020 15:19:55 +0000 Subject: [PATCH] examples: remove obsolete workaround for mingw MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The build still succeeds with the workaround removed, so whatever was causing the problem no longer exists. Reviewed-by: Pavel Hrdina Signed-off-by: Daniel P. Berrangé --- examples/c/domain/domtop.c | 15 --------------- examples/c/domain/suspend.c | 14 -------------- 2 files changed, 29 deletions(-) diff --git a/examples/c/domain/domtop.c b/examples/c/domain/domtop.c index e463e2873f..15611c586d 100644 --- a/examples/c/domain/domtop.c +++ b/examples/c/domain/domtop.c @@ -34,21 +34,6 @@ static bool debug; static bool run_top; -/* On mingw, there's a header file that poisons the well: - * - * - * CC domtop.o - *domtop.c:40:0: warning: "ERROR" redefined [enabled by default] - * #define ERROR(...) \ - * ^ - *In file included from /usr/i686-w64-mingw32/sys-root/mingw/include/windows.h:71:0, - * from /usr/i686-w64-mingw32/sys-root/mingw/include/winsock2.h:23, - * from ../../gnulib/lib/unistd.h:48, - * from domtop.c:35: - * /usr/i686-w64-mingw32/sys-root/mingw/include/wingdi.h:75:0: note: this is the location of the previous definition - * #define ERROR 0 - */ -#undef ERROR #define ERROR(...) \ do { \ fprintf(stderr, "ERROR %s:%d : ", __FUNCTION__, __LINE__); \ diff --git a/examples/c/domain/suspend.c b/examples/c/domain/suspend.c index 322f0d60df..980c4584c7 100644 --- a/examples/c/domain/suspend.c +++ b/examples/c/domain/suspend.c @@ -30,20 +30,6 @@ static int debug; -/* On mingw, there's a header file that poisons the well: - * - * - * CC domtop.o - *domtop.c:40:0: warning: "ERROR" redefined [enabled by default] - * #define ERROR(...) \ - * ^ - *In file included from /usr/i686-w64-mingw32/sys-root/mingw/include/windows.h:71:0, - * from /usr/i686-w64-mingw32/sys-root/mingw/include/winsock2.h:23, - * from ../../gnulib/lib/unistd.h:48, - * from domtop.c:35: - * /usr/i686-w64-mingw32/sys-root/mingw/include/wingdi.h:75:0: note: this is the location of the previous definition - * #define ERROR 0 - */ #undef ERROR #define ERROR(...) \ do { \