]> xenbits.xensource.com Git - libvirt.git/commitdiff
examples: remove obsolete workaround for mingw
authorDaniel P. Berrangé <berrange@redhat.com>
Fri, 24 Jan 2020 15:19:55 +0000 (15:19 +0000)
committerDaniel P. Berrangé <berrange@redhat.com>
Tue, 4 Feb 2020 14:00:44 +0000 (14:00 +0000)
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>
examples/c/domain/domtop.c
examples/c/domain/suspend.c

index e463e2873f424d69ea7c780aa1d441d270a4c2d3..15611c586d4503580cff15a001f5fce5ca534c3d 100644 (file)
 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__); \
index 322f0d60dfbab84853fe9d7ffc071657ca3cd5b9..980c4584c72c19ccac29c7ab133d28814677376f 100644 (file)
 
 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 { \