On 08/01/2011 05:33 AM, Dan Horák wrote:
There are functions in serial.c that are not used on s390(x) causing
problems when -Werror is used, so we add #ifdef/#endif around them.
---
loader/serial.c | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/loader/serial.c b/loader/serial.c
index 2e9fa5b..c4b722a 100644
--- a/loader/serial.c
+++ b/loader/serial.c
@@ -65,6 +65,7 @@ void restore_flags(int orig_flags) {
close(fd);
}
+#if !defined(__s390__)&& !defined(__s390x__)
static int serial_requested(GHashTable *cmdline) {
if (cmdline&& g_hash_table_lookup_extended(cmdline, "serial", NULL, NULL))
return 1;
@@ -148,6 +149,7 @@ static void set_term(int fd, GHashTable *cmdline) {
setenv("TERM", "vt100-nav", 1);
}
}
+#endif
void init_serial(struct termios *orig_cmode, int *orig_flags, GHashTable *cmdline) {
#if !defined(__s390__)&& !defined(__s390x__)
Looks fine, applying to master.
--
David Cantrell <dcantrell@xxxxxxxxxx>
Supervisor, Installer Engineering Team
Red Hat, Inc. | Westford, MA | EST5EDT
_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list
