X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Futils_mount.c;h=a02e5690d8a65a7dd4c71d44530a8766fdc43580;hb=8193ab130d383015697c992694c625862d873c14;hp=38ec24f09daed58cfbd0de7069dd18855f20d93b;hpb=444a2bce1161bb09c268f42757fc0fec83990549;p=collectd.git

diff --git a/src/utils_mount.c b/src/utils_mount.c
index 38ec24f0..a02e5690 100644
--- a/src/utils_mount.c
+++ b/src/utils_mount.c
@@ -502,7 +502,7 @@ static cu_mount_t *cu_mount_getfsstat (void)
 /* #endif HAVE_GETVFSSTAT || HAVE_GETFSSTAT */
 
 /* Solaris (SunOS 10): int getmntent(FILE *fp, struct mnttab *mp); */
-#elif HAVE_GEN_GETMNTENT
+#elif HAVE_TWO_GETMNTENT || HAVE_GEN_GETMNTENT || HAVE_SUN_GETMNTENT
 static cu_mount_t *cu_mount_gen_getmntent (void)
 {
 	struct mnttab mt;
@@ -551,17 +551,13 @@ static cu_mount_t *cu_mount_gen_getmntent (void)
 
 	return (first);
 } /* static cu_mount_t *cu_mount_gen_getmntent (void) */
-/* #endif HAVE_GEN_GETMNTENT */
+/* #endif HAVE_TWO_GETMNTENT || HAVE_GEN_GETMNTENT || HAVE_SUN_GETMNTENT */
 
 #elif HAVE_SEQ_GETMNTENT
 #warn "This version of `getmntent' hat not yet been implemented!"
 /* #endif HAVE_SEQ_GETMNTENT */
 
-#elif HAVE_SUN_GETMNTENT
-#warn "This version of `getmntent' hat not yet been implemented!"
-/* #endif HAVE_SUN_GETMNTENT */
-
-#elif HAVE_GETMNTENT
+#elif HAVE_ONE_GETMNTENT
 static cu_mount_t *cu_mount_getmntent (void)
 {
 	FILE *fp;
@@ -615,7 +611,7 @@ static cu_mount_t *cu_mount_getmntent (void)
 
 	return (first);
 }
-#endif /* HAVE_GETMNTENT */
+#endif /* HAVE_ONE_GETMNTENT */
 
 /* *** *** *** ******************************************** *** *** *** */
 /* *** *** *** *** *** ***   public functions   *** *** *** *** *** *** */
@@ -644,7 +640,7 @@ cu_mount_t *cu_mount_getlist(cu_mount_t **list)
 	new = cu_mount_getfsstat ();
 #elif HAVE_GEN_GETMNTENT
 	new = cu_mount_gen_getmntent ();
-#elif HAVE_GETMNTENT
+#elif HAVE_ONE_GETMNTENT
 	new = cu_mount_getmntent ();
 #else
 	new = NULL;