diff options
| -rw-r--r-- | winsup/cygwin/devices.h | 3 | ||||
| -rw-r--r-- | winsup/cygwin/path.cc | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/winsup/cygwin/devices.h b/winsup/cygwin/devices.h index 21120bdfc..991fd0538 100644 --- a/winsup/cygwin/devices.h +++ b/winsup/cygwin/devices.h @@ -13,7 +13,6 @@ details. */ typedef unsigned short _major_t; typedef unsigned short _minor_t; -typedef mode_t _mode_t; #define FHDEV(maj, min) ((((unsigned) (maj)) << (sizeof (_major_t) * 8)) | (unsigned) (min)) #define _minor(dev) ((dev) & ((1 << (sizeof (_minor_t) * 8)) - 1)) @@ -271,7 +270,7 @@ struct device } d; const char *native; int (*exists_func) (const device&); - _mode_t mode; + __mode_t mode; bool lives_in_dev:4; bool dev_on_fs:4; static const device *lookup (const char *, unsigned int = UINT32_MAX); diff --git a/winsup/cygwin/path.cc b/winsup/cygwin/path.cc index a839c0ad7..250871df0 100644 --- a/winsup/cygwin/path.cc +++ b/winsup/cygwin/path.cc @@ -97,7 +97,7 @@ struct symlink_info bool isdevice; _major_t major; _minor_t minor; - _mode_t mode; + __mode_t mode; int check (char *path, const suffix_info *suffixes, fs_info &fs, path_conv_handle &conv_hdl); int set (char *path); @@ -2565,7 +2565,7 @@ symlink_info::parse_device (const char *contents) char *endptr; _major_t mymajor; _major_t myminor; - _mode_t mymode; + __mode_t mymode; mymajor = strtol (contents += 2, &endptr, 16); if (endptr == contents) |