[libvirt] [PATCHv3 1/2] build: update gnulib for pipe on mingw

* .gnulib: Update to latest. * bootstrap.conf (gnulib_modules): Import pipe-posix and waitpid for mingw. * src/remote/remote_driver.c (pipe) [WIN32]: Drop dead macro. * daemon/event.c (pipe) [WIN32]: Drop dead function. --- v3: also import waitpid module v2: fix compilation error in daemon v1: initial patch .gnulib | 2 +- bootstrap.conf | 2 ++ daemon/event.c | 6 ------ src/remote/remote_driver.c | 5 ----- 4 files changed, 3 insertions(+), 12 deletions(-) diff --git a/.gnulib b/.gnulib index 6491120..980f9d2 160000 --- a/.gnulib +++ b/.gnulib @@ -1 +1 @@ -Subproject commit 64911207854610668b480939469282fdaeb96f74 +Subproject commit 980f9d2ceb43f9d86ea57db0367e569267c8571b diff --git a/bootstrap.conf b/bootstrap.conf index 2ad1957..282768b 100644 --- a/bootstrap.conf +++ b/bootstrap.conf @@ -48,6 +48,7 @@ mktempd netdb perror physmem +pipe-posix poll posix-shell pthread @@ -76,6 +77,7 @@ usleep vasprintf verify vc-list-files +waitpid ' # Additional xgettext options to use. Use "\\\newline" to break lines. diff --git a/daemon/event.c b/daemon/event.c index 01cb674..89ca9f0 100644 --- a/daemon/event.c +++ b/daemon/event.c @@ -621,12 +621,6 @@ static void virEventHandleWakeup(int watch ATTRIBUTE_UNUSED, virMutexUnlock(&eventLoop.lock); } -#ifdef WIN32 -static inline int pipe(int fd[2]) { - return _pipe(fd, 4096, 0); -} -#endif - int virEventInit(void) { if (virMutexInit(&eventLoop.lock) < 0) diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index e6eb9b5..fae191c 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -86,11 +86,6 @@ #define VIR_FROM_THIS VIR_FROM_REMOTE -#ifdef WIN32 -# define pipe(fds) _pipe(fds,4096, _O_BINARY) -#endif - - static int inside_daemon = 0; struct remote_thread_call; -- 1.7.3.3