ABI Break: aligning struct termios

Change-Id: I0109188fffbb166a5036e324a4a75b2491c39fb3

diff --git a/drivers/tty/tty.c b/drivers/tty/tty.c
index 8c28b092711d97b49990b113a718806bf83db703..bc532cc04757e97ed9595ea722aeed9e38469bfe 100644 (file)
--- a/drivers/tty/tty.c
+++ b/drivers/tty/tty.c
@@ -130,12 +130,12 @@ static void reset_color(tty_t *tp);
 
 /* Default attributes. */
 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,
        TQUIT_DEF, TTIME_DEF, TSUSP_DEF, TSTART_DEF, TSTOP_DEF,
        TREPRINT_DEF, TLNEXT_DEF, TDISCARD_DEF,
-  },
+  }, TSPEED_DEF, TSPEED_DEF,
 };
 static struct winsize winsize_defaults;        /* = all zeroes */
 

diff --git a/include/minix/termios.h b/include/minix/termios.h
index ec9bc259ab9cce33d99d266ca97ff7d24a065376..d4f58df295d23a4608ed4114f1762610a464bfb3 100644 (file)
--- a/include/minix/termios.h
+++ b/include/minix/termios.h
@@ -3,7 +3,7 @@
 #ifndef _TERMIOS_H
 #define _TERMIOS_H
 
-typedef unsigned short tcflag_t;
+typedef unsigned int tcflag_t;
 typedef unsigned char cc_t;
 typedef unsigned int speed_t;
 
@@ -16,9 +16,9 @@ struct termios {
   tcflag_t c_oflag;            /* output modes */
   tcflag_t c_cflag;            /* control modes */
   tcflag_t c_lflag;            /* local modes */
+  cc_t c_cc[NCCS];             /* control characters */
   speed_t  c_ispeed;           /* input 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. */