From: Daniel P. Berrangé <berrange@redhat.com>
Date: Fri, 24 Jan 2020 15:19:55 +0000 (+0000)
Subject: examples: remove obsolete workaround for mingw
X-Git-Tag: v6.1.0-rc1~232
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4d61dd5abf517e5f2be3607ca9aa5d09c4358790;p=thirdparty%2Flibvirt.git

examples: remove obsolete workaround for mingw

The build still succeeds with the workaround removed, so
whatever was causing the problem no longer exists.

Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---

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 { \