summaryrefslogtreecommitdiffstats
path: root/winsup/cygwin/include
diff options
context:
space:
mode:
Diffstat (limited to 'winsup/cygwin/include')
-rw-r--r--winsup/cygwin/include/mntent.h11
-rw-r--r--winsup/cygwin/include/paths.h4
2 files changed, 12 insertions, 3 deletions
diff --git a/winsup/cygwin/include/mntent.h b/winsup/cygwin/include/mntent.h
index c284cc7c6..8ad270ba0 100644
--- a/winsup/cygwin/include/mntent.h
+++ b/winsup/cygwin/include/mntent.h
@@ -1,6 +1,6 @@
/* mntent.h
- Copyright 1996, 1998, 1999, 2000, 2001, 2006, 2009 Red Hat, Inc.
+ Copyright 1996, 1998, 1999, 2000, 2001, 2006, 2009, 2010 Red Hat, Inc.
This file is part of Cygwin.
@@ -15,6 +15,8 @@ details. */
extern "C" {
#endif
+#include <paths.h>
+
struct mntent
{
char *mnt_fsname;
@@ -32,12 +34,17 @@ struct mntent *getmntent (FILE *__filep);
int endmntent (FILE *__filep);
#endif
+/* The following two defines are deprecated. Use the equivalent
+ names from paths.h instead. */
+#ifndef MNTTAB
+#define MNTTAB _PATH_MNTTAB
+#endif
/* This next file does exist, but the implementation of these
functions does not actually use it.
However, applications need the define to pass to setmntent().
*/
#ifndef MOUNTED
-#define MOUNTED "/etc/mtab"
+#define MOUNTED _PATH_MOUNTED
#endif
#ifdef __cplusplus
diff --git a/winsup/cygwin/include/paths.h b/winsup/cygwin/include/paths.h
index 11876cb29..8194f415b 100644
--- a/winsup/cygwin/include/paths.h
+++ b/winsup/cygwin/include/paths.h
@@ -1,6 +1,6 @@
/* paths.h
- Copyright 2001, 2002, 2003 Red Hat, Inc.
+ Copyright 2001, 2002, 2003, 2010 Red Hat, Inc.
This file is part of Cygwin.
@@ -19,6 +19,8 @@ details. */
#define _PATH_LASTLOG "/var/log/lastlog"
#define _PATH_MAN "/usr/share/man"
#define _PATH_MEM "/dev/mem"
+#define _PATH_MNTTAB "/etc/fstab"
+#define _PATH_MOUNTED "/etc/mtab"
#define _PATH_STDPATH "/bin:/usr/sbin:/sbin"
#define _PATH_TMP "/tmp/"
#define _PATH_TTY "/dev/tty"