External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-23 22:25:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

cygwin: Check explicitly for getmntent_r

Browse Source 
Cygwin has mntent.h but lacks getmntent_r. Update preprocessor
checks to catch this combination.
This commit is contained in:
Matthias Bolte 2010-04-23 11:34:17 +02:00
parent d1be0aefa9
commit 40648b156b
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/qemu/qemu_conf.c
View File

@ -114,7 +114,7 @@ int qemudLoadDriverConfig(struct qemud_driver *driver,
return -1;
}
#ifdef HAVE_MNTENT_H
#if defined HAVE_MNTENT_H && defined HAVE_GETMNTENT_R
/* For privileged driver, try and find hugepage mount automatically.
* Non-privileged driver requires admin to create a dir for the
* user, chown it, and then let user configure it manually */

10
src/util/cgroup.c
View File

@ -12,7 +12,7 @@
#include <stdio.h>
#include <stdint.h>
#ifdef HAVE_MNTENT_H
#if defined HAVE_MNTENT_H && defined HAVE_GETMNTENT_R
# include <mntent.h>
#endif
#include <fcntl.h>
@ -69,7 +69,7 @@ void virCgroupFree(virCgroupPtr *group)
VIR_FREE(*group);
}
#ifdef HAVE_MNTENT_H
#if defined HAVE_MNTENT_H && defined HAVE_GETMNTENT_R
/*
* Process /proc/mounts figuring out what controllers are
* mounted and where
@ -403,7 +403,7 @@ out:
}
#ifdef HAVE_MNTENT_H
#if defined HAVE_MNTENT_H && defined HAVE_GETMNTENT_R
static int virCgroupCpuSetInherit(virCgroupPtr parent, virCgroupPtr group)
{
int i;
@ -628,7 +628,7 @@ int virCgroupAddTask(virCgroupPtr group, pid_t pid)
*
* Returns 0 on success
*/
#ifdef HAVE_MNTENT_H
#if defined HAVE_MNTENT_H && defined HAVE_GETMNTENT_R
int virCgroupForDriver(const char *name,
virCgroupPtr *group,
int privileged,
@ -682,7 +682,7 @@ int virCgroupForDriver(const char *name ATTRIBUTE_UNUSED,
*
* Returns 0 on success
*/
#ifdef HAVE_MNTENT_H
#if defined HAVE_MNTENT_H && defined HAVE_GETMNTENT_R
int virCgroupForDomain(virCgroupPtr driver,
const char *name,
virCgroupPtr *group,

8
src/util/util.c
View File

@ -61,7 +61,7 @@
#if HAVE_CAPNG
# include <cap-ng.h>
#endif
#ifdef HAVE_MNTENT_H
#if defined HAVE_MNTENT_H && defined HAVE_GETMNTENT_R
# include <mntent.h>
#endif
@ -2716,7 +2716,7 @@ int virGetGroupID(const char *name ATTRIBUTE_UNUSED,
#endif /* HAVE_GETPWUID_R */
#ifdef HAVE_MNTENT_H
#if defined HAVE_MNTENT_H && defined HAVE_GETMNTENT_R
/* search /proc/mounts for mount point of *type; return pointer to
* malloc'ed string of the path if found, otherwise return NULL
* with errno set to an appropriate value.
@ -2748,7 +2748,7 @@ cleanup:
return ret;
}
#else /* HAVE_MNTENT_H */
#else /* defined HAVE_MNTENT_H && defined HAVE_GETMNTENT_R */
char *
virFileFindMountPoint(const char *type ATTRIBUTE_UNUSED)
@ -2758,7 +2758,7 @@ virFileFindMountPoint(const char *type ATTRIBUTE_UNUSED)
return NULL;
}
#endif /* HAVE_MNTENT_H */
#endif /* defined HAVE_MNTENT_H && defined HAVE_GETMNTENT_R */
#ifndef PROXY
# if defined(UDEVADM) || defined(UDEVSETTLE)