From 0f7ba8c21c446e47d21de559b759c25faa45be48 Mon Sep 17 00:00:00 2001
From: Matthias Bolte <matthias.bolte@googlemail.com>
Date: Wed, 17 Mar 2010 01:06:31 +0100
Subject: [PATCH] util: Make some conditional symbols unconditional

Add dummy bodies for HAVE_GETPWUID_R and HAVE_MNTENT_H dependent
functions for MinGW builds.
---
 src/util/util.c | 54 +++++++++++++++++++++++++++++++++++++++++++++++--
 src/util/util.h |  4 ----
 2 files changed, 52 insertions(+), 6 deletions(-)

diff --git a/src/util/util.c b/src/util/util.c
index 87b0714022..3e892606d4 100644
--- a/src/util/util.c
+++ b/src/util/util.c
@@ -2585,7 +2585,46 @@ int virGetGroupID(const char *name,
 
     return 0;
 }
-#endif
+
+#else /* HAVE_GETPWUID_R */
+
+char *
+virGetUserDirectory(uid_t uid ATTRIBUTE_UNUSED)
+{
+    virUtilError(VIR_ERR_INTERNAL_ERROR,
+                 "%s", _("virGetUserDirectory is not avialable"));
+
+    return NULL;
+}
+
+char *
+virGetUserName(uid_t uid ATTRIBUTE_UNUSED)
+{
+    virUtilError(VIR_ERR_INTERNAL_ERROR,
+                 "%s", _("virGetUserName is not avialable"));
+
+    return NULL;
+}
+
+int virGetUserID(const char *name ATTRIBUTE_UNUSED,
+                 uid_t *uid ATTRIBUTE_UNUSED)
+{
+    virUtilError(VIR_ERR_INTERNAL_ERROR,
+                 "%s", _("virGetUserID is not avialable"));
+
+    return 0;
+}
+
+
+int virGetGroupID(const char *name ATTRIBUTE_UNUSED,
+                  gid_t *gid ATTRIBUTE_UNUSED)
+{
+    virUtilError(VIR_ERR_INTERNAL_ERROR,
+                 "%s", _("virGetGroupID is not avialable"));
+
+    return 0;
+}
+#endif /* HAVE_GETPWUID_R */
 
 
 #ifdef HAVE_MNTENT_H
@@ -2619,7 +2658,18 @@ cleanup:
 
     return ret;
 }
-#endif
+
+#else /* HAVE_MNTENT_H */
+
+char *
+virFileFindMountPoint(const char *type ATTRIBUTE_UNUSED)
+{
+    errno = ENOSYS;
+
+    return NULL;
+}
+
+#endif /* HAVE_MNTENT_H */
 
 #ifndef PROXY
 # if defined(UDEVADM) || defined(UDEVSETTLE)
diff --git a/src/util/util.h b/src/util/util.h
index e8fc5656b8..e69eb5c947 100644
--- a/src/util/util.h
+++ b/src/util/util.h
@@ -247,21 +247,17 @@ char *virGetHostname(virConnectPtr conn);
 
 int virKillProcess(pid_t pid, int sig);
 
-# ifdef HAVE_GETPWUID_R
 char *virGetUserDirectory(uid_t uid);
 char *virGetUserName(uid_t uid);
 int virGetUserID(const char *name,
                  uid_t *uid) ATTRIBUTE_RETURN_CHECK;
 int virGetGroupID(const char *name,
                   gid_t *gid) ATTRIBUTE_RETURN_CHECK;
-# endif
 
 int virRandomInitialize(unsigned int seed) ATTRIBUTE_RETURN_CHECK;
 int virRandom(int max);
 
-# ifdef HAVE_MNTENT_H
 char *virFileFindMountPoint(const char *type);
-# endif
 
 void virFileWaitForDevices(void);
 
-- 
GitLab