libs/newlib-cygwin
libs
/
newlib-cygwin
mirror of git://sourceware.org/git/newlib-cygwin.git
4
0
Fork 0
Code Issues Projects Releases Wiki Activity

Remove unused 32/64 bit tty code 

* tty.h (class tty): Remove unused 32/64 bit interoperability
	considerations.

Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
This commit is contained in:
Corinna Vinschen 2015-04-07 12:16:07 +02:00
parent de7944034d
commit cf38039975
No known key found for this signature in database
GPG Key ID: F536069DAE444FA0
2 changed files with 8 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
winsup/cygwin/ChangeLog
View File

@ -1,3 +1,8 @@
2015-04-07 Corinna Vinschen <corinna@vinschen.de>
* tty.h (class tty): Remove unused 32/64 bit interoperability
considerations.
2015-04-07 Corinna Vinschen <corinna@vinschen.de> 2015-04-07 Corinna Vinschen <corinna@vinschen.de>
* tty.h (NTTYS): Raise to 128. * tty.h (NTTYS): Raise to 128.

21
winsup/cygwin/tty.h
View File

@ -90,29 +90,14 @@ public:
pid_t master_pid; /* PID of tty master process */ pid_t master_pid; /* PID of tty master process */
private: private:
/* Since tty is shared, the HANDLEs must be 32 and 64 bit clean. The below HANDLE _from_master;
code makes sure of that by setting the upper 4 byte of the union to 0 HANDLE _to_master;
when writing the handle value from a 32 bit process. Fortunately the
actual values are 32 bit on both platforms, so the HANDLES can be
used on both platforms. */
union {
HANDLE _from_master;
LARGE_INTEGER _fm_dummy;
};
union {
HANDLE _to_master;
LARGE_INTEGER _tm_dummy;
};
public: public:
HANDLE from_master() const { return _from_master; } HANDLE from_master() const { return _from_master; }
HANDLE to_master() const { return _to_master; } HANDLE to_master() const { return _to_master; }
#ifdef __x86_64__
void set_from_master (HANDLE h) { _from_master = h; } void set_from_master (HANDLE h) { _from_master = h; }
void set_to_master (HANDLE h) { _to_master = h; } void set_to_master (HANDLE h) { _to_master = h; }
#else
void set_from_master (HANDLE h) { _fm_dummy.HighPart = 0; _from_master = h; }
void set_to_master (HANDLE h) { _tm_dummy.HighPart = 0; _to_master = h; }
#endif
int read_retval; int read_retval;
bool was_opened; /* True if opened at least once. */ bool was_opened; /* True if opened at least once. */