util: Make some conditional symbols unconditional

Add dummy bodies for HAVE_GETPWUID_R and HAVE_MNTENT_H dependent
functions for MinGW builds.

diff --git a/src/util/util.c b/src/util/util.c
index 87b07140225c7051d70892193583676ef28361ea..3e892606d485dc1f7145d2cb15a69360db254df5 100644 (file)
--- 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 e8fc5656b8a41fadc923f04e703c7e64868da949..e69eb5c94764a16c17b794bd687e17f66d7e319f 100644 (file)
--- 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);