From ec8a2d0327ee214111bca04c39ab61a9fc247f28 Mon Sep 17 00:00:00 2001
From: Eric Blake <eblake@redhat.com>
Date: Mon, 11 Feb 2013 15:12:16 -0700
Subject: [PATCH] regex: gnulib guarantees that we have regex support

No need to use HAVE_REGEX_H - our use of gnulib guarantees that
the header exists and works, regardless of platform.  Similarly,
we can unconditionally assume a compiling <sys/wait.h> (although
the mingw version of this header is not full-featured).

* src/storage/storage_backend.c: Drop useless conditional.
* tests/testutils.c: Likewise.
---
 src/storage/storage_backend.c |  4 +---
 tests/testutils.c             | 18 +++---------------
 2 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/src/storage/storage_backend.c b/src/storage/storage_backend.c
index b0ddd46f35..87eca5ea20 100644
--- a/src/storage/storage_backend.c
+++ b/src/storage/storage_backend.c
@@ -25,9 +25,7 @@
 
 #include <string.h>
 #include <stdio.h>
-#if HAVE_REGEX_H
-# include <regex.h>
-#endif
+#include <regex.h>
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <unistd.h>
diff --git a/tests/testutils.c b/tests/testutils.c
index 9c8f3651f9..7b2ea5122e 100644
--- a/tests/testutils.c
+++ b/tests/testutils.c
@@ -1,7 +1,7 @@
 /*
  * testutils.c: basic test utils
  *
- * Copyright (C) 2005-2012 Red Hat, Inc.
+ * Copyright (C) 2005-2013 Red Hat, Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -27,12 +27,8 @@
 #include <sys/time.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-#ifndef WIN32
-# include <sys/wait.h>
-#endif
-#ifdef HAVE_REGEX_H
-# include <regex.h>
-#endif
+#include <sys/wait.h>
+#include <regex.h>
 #include <unistd.h>
 #include <string.h>
 #include <fcntl.h>
@@ -735,7 +731,6 @@ cleanup:
 }
 
 
-#ifdef HAVE_REGEX_H
 int virtTestClearLineRegex(const char *pattern,
                            char *str)
 {
@@ -779,10 +774,3 @@ int virtTestClearLineRegex(const char *pattern,
 
     return 0;
 }
-#else
-int virtTestClearLineRegex(const char *pattern ATTRIBUTE_UNUSED,
-                           char *str ATTRIBUTE_UNUSED)
-{
-    return 0;
-}
-#endif