Re: [libvirt] [PATCH 09/15] util: Make some conditional symbols unconditional

On Mon, 2010-03-22 at 02:25 +0100, Matthias Bolte wrote: > 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 87b0714..3e89260 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 */ Minor typo - these should all be "available" rather than "avialable". Hope this helps, Paul