From: Laine Stump <laine@redhat.com>

This will make it easier to, e.g., add sanity checks to the Linux
versions of these functions without potentially causing regressions on
a platform that isn't widely tested

Signed-off-by: Laine Stump <laine@redhat.com>
---
 src/util/virutil.c | 45 +++++++++++++++++++++++++++++++++------------
 1 file changed, 33 insertions(+), 12 deletions(-)

diff --git a/src/util/virutil.c b/src/util/virutil.c
index 3c0d04c3d7..b40229c7cf 100644
--- a/src/util/virutil.c
+++ b/src/util/virutil.c
@@ -588,43 +588,64 @@ virGetHostnameQuiet(void)
 }
 
 
+
+#ifdef WIN32
+
+
 char *
 virGetUserHomeDirectory(void)
 {
     return g_strdup(g_get_home_dir());
 }
 
-
 char *virGetUserConfigDirectory(void)
 {
-#ifdef WIN32
     return g_strdup(g_get_user_config_dir());
-#else
-    return g_build_filename(g_get_user_config_dir(), "libvirt", NULL);
-#endif
 }
 
 
 char *virGetUserCacheDirectory(void)
 {
-#ifdef WIN32
     return g_strdup(g_get_user_cache_dir());
-#else
-    return g_build_filename(g_get_user_cache_dir(), "libvirt", NULL);
-#endif
 }
 
 
 char *virGetUserRuntimeDirectory(void)
 {
-#ifdef WIN32
     return g_strdup(g_get_user_runtime_dir());
-#else
+}
+
+
+#else /* !WIN32 */
+
+
+char *
+virGetUserHomeDirectory(void)
+{
+    return g_strdup(g_get_home_dir());
+}
+
+char *virGetUserConfigDirectory(void)
+{
+    return g_build_filename(g_get_user_config_dir(), "libvirt", NULL);
+}
+
+
+char *virGetUserCacheDirectory(void)
+{
+    return g_build_filename(g_get_user_cache_dir(), "libvirt", NULL);
+}
+
+
+char *virGetUserRuntimeDirectory(void)
+{
     return g_build_filename(g_get_user_runtime_dir(), "libvirt", NULL);
-#endif
 }
 
 
+#endif /* !WIN32 */
+
+
 #ifdef WITH_GETPWUID_R
 /* Look up fields from the user database for the given user.  On
  * error, set errno, report the error if not instructed otherwise via @quiet,
-- 
2.52.0