From 7d1cb1caefce1ce6e1292d739b8aad2b260fe9b8 Mon Sep 17 00:00:00 2001
From: Lionel Sambuc <lionel@minix3.org>
Date: Fri, 19 Apr 2013 09:54:09 +0200
Subject: [PATCH] ABI Break: aligning struct termios

Change-Id: I0109188fffbb166a5036e324a4a75b2491c39fb3
---
 drivers/tty/tty.c       | 4 ++--
 include/minix/termios.h | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/tty/tty.c b/drivers/tty/tty.c
index 8c28b0927..bc532cc04 100644
--- 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 ec9bc259a..d4f58df29 100644
--- 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. */