ABI Break: aligning struct termios

Change-Id: I0109188fffbb166a5036e324a4a75b2491c39fb3
This commit is contained in:
Lionel Sambuc 2013-04-19 09:54:09 +02:00
parent 65333e5108
commit 7d1cb1caef
2 changed files with 4 additions and 4 deletions

View file

@ -130,12 +130,12 @@ static void reset_color(tty_t *tp);
/* Default attributes. */ /* Default attributes. */
static struct termios termios_defaults = { static struct termios termios_defaults = {
TINPUT_DEF, TOUTPUT_DEF, TCTRL_DEF, TLOCAL_DEF, TSPEED_DEF, TSPEED_DEF, TINPUT_DEF, TOUTPUT_DEF, TCTRL_DEF, TLOCAL_DEF,
{ {
TEOF_DEF, TEOL_DEF, TERASE_DEF, TINTR_DEF, TKILL_DEF, TMIN_DEF, TEOF_DEF, TEOL_DEF, TERASE_DEF, TINTR_DEF, TKILL_DEF, TMIN_DEF,
TQUIT_DEF, TTIME_DEF, TSUSP_DEF, TSTART_DEF, TSTOP_DEF, TQUIT_DEF, TTIME_DEF, TSUSP_DEF, TSTART_DEF, TSTOP_DEF,
TREPRINT_DEF, TLNEXT_DEF, TDISCARD_DEF, TREPRINT_DEF, TLNEXT_DEF, TDISCARD_DEF,
}, }, TSPEED_DEF, TSPEED_DEF,
}; };
static struct winsize winsize_defaults; /* = all zeroes */ static struct winsize winsize_defaults; /* = all zeroes */

View file

@ -3,7 +3,7 @@
#ifndef _TERMIOS_H #ifndef _TERMIOS_H
#define _TERMIOS_H #define _TERMIOS_H
typedef unsigned short tcflag_t; typedef unsigned int tcflag_t;
typedef unsigned char cc_t; typedef unsigned char cc_t;
typedef unsigned int speed_t; typedef unsigned int speed_t;
@ -16,9 +16,9 @@ struct termios {
tcflag_t c_oflag; /* output modes */ tcflag_t c_oflag; /* output modes */
tcflag_t c_cflag; /* control modes */ tcflag_t c_cflag; /* control modes */
tcflag_t c_lflag; /* local modes */ tcflag_t c_lflag; /* local modes */
cc_t c_cc[NCCS]; /* control characters */
speed_t c_ispeed; /* input speed */ speed_t c_ispeed; /* input speed */
speed_t c_ospeed; /* output speed */ speed_t c_ospeed; /* output speed */
cc_t c_cc[NCCS]; /* control characters */
}; };
/* Values for termios c_iflag bit map. POSIX Table 7-2. */ /* Values for termios c_iflag bit map. POSIX Table 7-2. */