JehanneOS
/
newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Cygwin: Drop definition and usage of _mode_t in favor of __mode_t 

Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
This commit is contained in:
Corinna Vinschen 2016-04-15 14:49:36 +02:00
parent 78c9002201
commit ea58e20c0e
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
winsup/cygwin/devices.h
View File

@ -13,7 +13,6 @@ details. */
typedef unsigned short _major_t; typedef unsigned short _major_t;
typedef unsigned short _minor_t; typedef unsigned short _minor_t;
typedef mode_t _mode_t;
#define FHDEV(maj, min) ((((unsigned) (maj)) << (sizeof (_major_t) * 8)) | (unsigned) (min)) #define FHDEV(maj, min) ((((unsigned) (maj)) << (sizeof (_major_t) * 8)) | (unsigned) (min))
#define _minor(dev) ((dev) & ((1 << (sizeof (_minor_t) * 8)) - 1)) #define _minor(dev) ((dev) & ((1 << (sizeof (_minor_t) * 8)) - 1))
@ -271,7 +270,7 @@ struct device
} d; } d;
const char *native; const char *native;
int (*exists_func) (const device&); int (*exists_func) (const device&);
_mode_t mode; __mode_t mode;
bool lives_in_dev:4; bool lives_in_dev:4;
bool dev_on_fs:4; bool dev_on_fs:4;
static const device *lookup (const char *, unsigned int = UINT32_MAX); static const device *lookup (const char *, unsigned int = UINT32_MAX);

4
winsup/cygwin/path.cc
View File

@ -97,7 +97,7 @@ struct symlink_info
bool isdevice; bool isdevice;
_major_t major; _major_t major;
_minor_t minor; _minor_t minor;
_mode_t mode; __mode_t mode;
int check (char *path, const suffix_info *suffixes, fs_info &fs, int check (char *path, const suffix_info *suffixes, fs_info &fs,
path_conv_handle &conv_hdl); path_conv_handle &conv_hdl);
int set (char *path); int set (char *path);
@ -2565,7 +2565,7 @@ symlink_info::parse_device (const char *contents)
char *endptr; char *endptr;
_major_t mymajor; _major_t mymajor;
_major_t myminor; _major_t myminor;
_mode_t mymode; __mode_t mymode;
mymajor = strtol (contents += 2, &endptr, 16); mymajor = strtol (contents += 2, &endptr, 16);
if (endptr == contents) if (endptr == contents)