summaryrefslogtreecommitdiff
path: root/misc
diff options
context:
space:
mode:
authorewt <devnull@localhost>1997-06-19 22:18:02 +0000
committerewt <devnull@localhost>1997-06-19 22:18:02 +0000
commitdda52c18d6a434f6f4c947cd75770240a738f9d6 (patch)
tree594fdcacf7e386717cede15e55be9d3e9f243f4f /misc
parent5b52e398993a6bc104fc88912f88ed61b9ad9be0 (diff)
downloadrpm-dda52c18d6a434f6f4c947cd75770240a738f9d6.tar.gz
rpm-dda52c18d6a434f6f4c947cd75770240a738f9d6.tar.bz2
rpm-dda52c18d6a434f6f4c947cd75770240a738f9d6.zip
Changes for OSF/1 getmntinfo_r()
CVS patchset: 1708 CVS date: 1997/06/19 22:18:02
Diffstat (limited to 'misc')
-rw-r--r--misc/getmntent.c2
-rw-r--r--misc/miscfn.h5
2 files changed, 5 insertions, 2 deletions
diff --git a/misc/getmntent.c b/misc/getmntent.c
index ebce8ab34..d2455a266 100644
--- a/misc/getmntent.c
+++ b/misc/getmntent.c
@@ -11,7 +11,7 @@
#define COMMENTCHAR '#'
#endif
-#if HAVE_STRUCT_MNTTAB {
+#if HAVE_STRUCT_MNTTAB
our_mntent * getmntent(FILE *filep) {
static struct mnttab entry;
static our_mntent item = { entry.mt_filsys };
diff --git a/misc/miscfn.h b/misc/miscfn.h
index 0ca0ef397..80a519480 100644
--- a/misc/miscfn.h
+++ b/misc/miscfn.h
@@ -62,7 +62,10 @@ extern void *myrealloc(void *, size_t);
#define lchown chown
#endif
-#if HAVE_MNTENT_H || !(HAVE_GETMNTENT) || HAVE_STRUCT_MNTTAB
+#if HAVE_GETMNTINFO_R || HAVE_MNTCTL
+# define GETMNTENT_ONE 0
+# define GETMNTENT_TWO 0
+#elif HAVE_MNTENT_H || !(HAVE_GETMNTENT) || HAVE_STRUCT_MNTTAB
# if HAVE_MNTENT_H || HAVE_STRUCT_MNTTAB
# include <mntent.h>
# define our_mntent struct mntent