[Minios-devel] [UNIKRAFT/NEWLIB PATCH 6/8] Adapt termios.h headers to newlib glue code

[Costin Lupu <costin.lupu@xxxxxxxxx>]

Signed-off-by: Costin Lupu <costin.lupu@xxxxxxxxx>
---
 musl-imported/arch/generic/bits/termios.h |  5 ----
 musl-imported/include/termios.h           | 30 +++++++++++++++++++----
 2 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/musl-imported/arch/generic/bits/termios.h 
b/musl-imported/arch/generic/bits/termios.h
index ec6e74f..cbfc621 100644
--- a/musl-imported/arch/generic/bits/termios.h
+++ b/musl-imported/arch/generic/bits/termios.h
@@ -24,11 +24,6 @@
  */
 /* Taken from musl */
 
-typedef unsigned char cc_t;
-typedef unsigned int speed_t;
-typedef unsigned int tcflag_t;
-#define NCCS 32
-
 struct termios {
        tcflag_t c_iflag;
        tcflag_t c_oflag;
diff --git a/musl-imported/include/termios.h b/musl-imported/include/termios.h
index d73c780..5dd5c4e 100644
--- a/musl-imported/include/termios.h
+++ b/musl-imported/include/termios.h
@@ -1,3 +1,27 @@
+/* SPDX-License-Identifier: MIT */
+/* ----------------------------------------------------------------------
+ * Copyright © 2005-2014 Rich Felker, et al.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ * ----------------------------------------------------------------------
+ */
 #ifndef        _TERMIOS_H
 #define        _TERMIOS_H
 
@@ -5,11 +29,7 @@
 extern "C" {
 #endif
 
-#include <features.h>
-
-#define __NEED_pid_t
-
-#include <bits/alltypes.h>
+#include <sys/types.h>
 
 typedef unsigned char cc_t;
 typedef unsigned int speed_t;
-- 
2.20.1


_______________________________________________
Minios-devel mailing list
Minios-devel@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/mailman/listinfo/minios-devel