* Merge in cygwin-64bit-branch.

This commit is contained in:
Corinna Vinschen
2013-04-23 09:44:36 +00:00
parent 1875ee55d3
commit 61522196c7
253 changed files with 10632 additions and 5055 deletions

View File

@@ -70,7 +70,7 @@ exists_ntdev_silent (const device& dev)
static int
exists_console (const device& dev)
{
int devn = *const_cast<device *> (&dev);
fh_devices devn = *const_cast<device *> (&dev);
switch (devn)
{
case FH_CONSOLE:
@@ -45845,7 +45845,7 @@ device::init ()
void
device::parse (_major_t major, _minor_t minor)
{
_dev_t devn = FHDEV (major, minor);
dev_t devn = FHDEV (major, minor);
d.devn = 0;
@@ -45861,7 +45861,7 @@ device::parse (_major_t major, _minor_t minor)
}
void
device::parse (_dev_t dev)
device::parse (dev_t dev)
{
parse (_major (dev), _minor (dev));
}