| author | Rich Burridge <rich.burridge@oracle.com> |
| Fri, 03 Oct 2014 06:49:24 -0700 | |
| changeset 2129 | bf833e1aa881 |
| child 3897 | cd126ba3fdda |
| permissions | -rw-r--r-- |
|
2129
bf833e1aa881
PSARC 2014/170 text-utilities version 2.24.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
1 |
Changes needed to get column to build on Solaris |
|
bf833e1aa881
PSARC 2014/170 text-utilities version 2.24.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
2 |
|
|
bf833e1aa881
PSARC 2014/170 text-utilities version 2.24.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
3 |
These changes will be sent upstream. |
|
bf833e1aa881
PSARC 2014/170 text-utilities version 2.24.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
4 |
|
|
bf833e1aa881
PSARC 2014/170 text-utilities version 2.24.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
5 |
--- util-linux-2.24.2/include/ttyutils.h.orig 2014-05-13 10:55:05.789258799 -0700 |
|
bf833e1aa881
PSARC 2014/170 text-utilities version 2.24.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
6 |
+++ util-linux-2.24.2/include/ttyutils.h 2014-05-13 11:05:20.943543261 -0700 |
|
bf833e1aa881
PSARC 2014/170 text-utilities version 2.24.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
7 |
@@ -57,6 +57,29 @@ |
|
bf833e1aa881
PSARC 2014/170 text-utilities version 2.24.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
8 |
#define UL_TTY_KEEPCFLAGS (1 << 1) |
|
bf833e1aa881
PSARC 2014/170 text-utilities version 2.24.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
9 |
#define UL_TTY_UTF8 (1 << 2) |
|
bf833e1aa881
PSARC 2014/170 text-utilities version 2.24.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
10 |
|
|
bf833e1aa881
PSARC 2014/170 text-utilities version 2.24.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
11 |
+/* These are not defined in Solaris. Taken from tmux compat/ttydefaults.h */ |
|
bf833e1aa881
PSARC 2014/170 text-utilities version 2.24.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
12 |
+#ifndef OXTABS |
|
bf833e1aa881
PSARC 2014/170 text-utilities version 2.24.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
13 |
+#define OXTABS 0 |
|
bf833e1aa881
PSARC 2014/170 text-utilities version 2.24.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
14 |
+#endif |
|
bf833e1aa881
PSARC 2014/170 text-utilities version 2.24.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
15 |
+#ifndef TTYDEF_IFLAG |
|
bf833e1aa881
PSARC 2014/170 text-utilities version 2.24.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
16 |
+#define TTYDEF_IFLAG (BRKINT | ICRNL | IMAXBEL | IXON | IXANY) |
|
bf833e1aa881
PSARC 2014/170 text-utilities version 2.24.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
17 |
+#endif |
|
bf833e1aa881
PSARC 2014/170 text-utilities version 2.24.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
18 |
+#ifndef TTYDEF_OFLAG |
|
bf833e1aa881
PSARC 2014/170 text-utilities version 2.24.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
19 |
+#define TTYDEF_OFLAG (OPOST | ONLCR | OXTABS) |
|
bf833e1aa881
PSARC 2014/170 text-utilities version 2.24.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
20 |
+#endif |
|
bf833e1aa881
PSARC 2014/170 text-utilities version 2.24.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
21 |
+#ifndef TTYDEF_LFLAG |
|
bf833e1aa881
PSARC 2014/170 text-utilities version 2.24.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
22 |
+#define TTYDEF_LFLAG (ECHO | ICANON | ISIG | IEXTEN | ECHOE|ECHOKE|ECHOCTL) |
|
bf833e1aa881
PSARC 2014/170 text-utilities version 2.24.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
23 |
+#endif |
|
bf833e1aa881
PSARC 2014/170 text-utilities version 2.24.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
24 |
+#ifndef TTYDEF_CFLAG |
|
bf833e1aa881
PSARC 2014/170 text-utilities version 2.24.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
25 |
+#define TTYDEF_CFLAG (CREAD | CS8 | HUPCL) |
|
bf833e1aa881
PSARC 2014/170 text-utilities version 2.24.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
26 |
+#endif |
|
bf833e1aa881
PSARC 2014/170 text-utilities version 2.24.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
27 |
+#ifndef CREPRINT |
|
bf833e1aa881
PSARC 2014/170 text-utilities version 2.24.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
28 |
+#define CREPRINT CTRL('r')
|
|
bf833e1aa881
PSARC 2014/170 text-utilities version 2.24.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
29 |
+#endif |
|
bf833e1aa881
PSARC 2014/170 text-utilities version 2.24.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
30 |
+#ifndef CDISCARD |
|
bf833e1aa881
PSARC 2014/170 text-utilities version 2.24.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
31 |
+#define CDISCARD CTRL('o')
|
|
bf833e1aa881
PSARC 2014/170 text-utilities version 2.24.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
32 |
+#endif |
|
bf833e1aa881
PSARC 2014/170 text-utilities version 2.24.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
33 |
+ |
|
bf833e1aa881
PSARC 2014/170 text-utilities version 2.24.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
34 |
static inline void reset_virtual_console(struct termios *tp, int flags) |
|
bf833e1aa881
PSARC 2014/170 text-utilities version 2.24.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
35 |
{
|
|
bf833e1aa881
PSARC 2014/170 text-utilities version 2.24.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
36 |
/* Use defaults of <sys/ttydefaults.h> for base settings */ |