diff options
author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-12-27 16:37:51 +0000 |
---|---|---|
committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-12-27 16:37:51 +0000 |
commit | 09ac56ee3bd5e4b9684e09c0653062a71125345d (patch) | |
tree | 2078c8544323b9235517435ea8fe485caf150069 /termios | |
parent | 13453e9b8e169bf4048572a4ae1c8b3cb51ab215 (diff) | |
parent | d922d40dd807c1b8dc2a59ecedc9ec848a63e0e4 (diff) |
Merge commit 'refs/top-bases/t/hurdsig-SA_SIGINFO' into t/hurdsig-SA_SIGINFO
Diffstat (limited to 'termios')
-rw-r--r-- | termios/Makefile | 4 | ||||
-rw-r--r-- | termios/cfmakeraw.c | 2 | ||||
-rw-r--r-- | termios/cfsetspeed.c | 2 | ||||
-rw-r--r-- | termios/speed.c | 2 | ||||
-rw-r--r-- | termios/tcdrain.c | 2 | ||||
-rw-r--r-- | termios/tcflow.c | 2 | ||||
-rw-r--r-- | termios/tcflush.c | 2 | ||||
-rw-r--r-- | termios/tcgetattr.c | 3 | ||||
-rw-r--r-- | termios/tcgetpgrp.c | 2 | ||||
-rw-r--r-- | termios/tcgetsid.c | 2 | ||||
-rw-r--r-- | termios/tcsendbrk.c | 2 | ||||
-rw-r--r-- | termios/tcsetattr.c | 2 | ||||
-rw-r--r-- | termios/tcsetpgrp.c | 2 | ||||
-rw-r--r-- | termios/termios.h | 6 |
14 files changed, 18 insertions, 17 deletions
diff --git a/termios/Makefile b/termios/Makefile index 338afebd8e..a79e4f1565 100644 --- a/termios/Makefile +++ b/termios/Makefile @@ -1,4 +1,4 @@ -# Copyright (C) 1991-2016 Free Software Foundation, Inc. +# Copyright (C) 1991-2018 Free Software Foundation, Inc. # This file is part of the GNU C Library. # The GNU C Library is free software; you can redistribute it and/or @@ -30,4 +30,4 @@ routines := speed cfsetspeed tcsetattr tcgetattr tcgetpgrp tcsetpgrp \ include ../Rules -CFLAGS-tcdrain.c = -fexceptions -fasynchronous-unwind-tables +CFLAGS-tcdrain.c += -fexceptions -fasynchronous-unwind-tables diff --git a/termios/cfmakeraw.c b/termios/cfmakeraw.c index 2da17fabf6..4711b1c723 100644 --- a/termios/cfmakeraw.c +++ b/termios/cfmakeraw.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1992-2016 Free Software Foundation, Inc. +/* Copyright (C) 1992-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or diff --git a/termios/cfsetspeed.c b/termios/cfsetspeed.c index 73f1a7fd88..89f60367a2 100644 --- a/termios/cfsetspeed.c +++ b/termios/cfsetspeed.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1992-2016 Free Software Foundation, Inc. +/* Copyright (C) 1992-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or diff --git a/termios/speed.c b/termios/speed.c index f921e77023..6f332ea885 100644 --- a/termios/speed.c +++ b/termios/speed.c @@ -1,5 +1,5 @@ /* `struct termios' speed frobnication functions. 4.4 BSD/generic GNU version. - Copyright (C) 1991-2016 Free Software Foundation, Inc. + Copyright (C) 1991-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or diff --git a/termios/tcdrain.c b/termios/tcdrain.c index 97da3b83c9..466da83797 100644 --- a/termios/tcdrain.c +++ b/termios/tcdrain.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991-2016 Free Software Foundation, Inc. +/* Copyright (C) 1991-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or diff --git a/termios/tcflow.c b/termios/tcflow.c index c152979e21..7108317ffd 100644 --- a/termios/tcflow.c +++ b/termios/tcflow.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991-2016 Free Software Foundation, Inc. +/* Copyright (C) 1991-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or diff --git a/termios/tcflush.c b/termios/tcflush.c index 86a7c35252..325b49f512 100644 --- a/termios/tcflush.c +++ b/termios/tcflush.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991-2016 Free Software Foundation, Inc. +/* Copyright (C) 1991-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or diff --git a/termios/tcgetattr.c b/termios/tcgetattr.c index b14a8c5fef..f7c5a07cc9 100644 --- a/termios/tcgetattr.c +++ b/termios/tcgetattr.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991-2016 Free Software Foundation, Inc. +/* Copyright (C) 1991-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -39,4 +39,5 @@ __tcgetattr (int fd, struct termios *termios_p) } stub_warning (tcgetattr) +libc_hidden_def (__tcgetattr) weak_alias (__tcgetattr, tcgetattr) diff --git a/termios/tcgetpgrp.c b/termios/tcgetpgrp.c index 7d94d9de89..9693e0561f 100644 --- a/termios/tcgetpgrp.c +++ b/termios/tcgetpgrp.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991-2016 Free Software Foundation, Inc. +/* Copyright (C) 1991-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or diff --git a/termios/tcgetsid.c b/termios/tcgetsid.c index 4edb975766..600e8ce151 100644 --- a/termios/tcgetsid.c +++ b/termios/tcgetsid.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1997-2016 Free Software Foundation, Inc. +/* Copyright (C) 1997-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or diff --git a/termios/tcsendbrk.c b/termios/tcsendbrk.c index d8ce441aa1..f8279a2223 100644 --- a/termios/tcsendbrk.c +++ b/termios/tcsendbrk.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991-2016 Free Software Foundation, Inc. +/* Copyright (C) 1991-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or diff --git a/termios/tcsetattr.c b/termios/tcsetattr.c index cff47cdadd..32829e9055 100644 --- a/termios/tcsetattr.c +++ b/termios/tcsetattr.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991-2016 Free Software Foundation, Inc. +/* Copyright (C) 1991-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or diff --git a/termios/tcsetpgrp.c b/termios/tcsetpgrp.c index 20d84af815..7ba765d6b0 100644 --- a/termios/tcsetpgrp.c +++ b/termios/tcsetpgrp.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991-2016 Free Software Foundation, Inc. +/* Copyright (C) 1991-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or diff --git a/termios/termios.h b/termios/termios.h index a56bb88c75..a932fd680e 100644 --- a/termios/termios.h +++ b/termios/termios.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1991-2016 Free Software Foundation, Inc. +/* Copyright (C) 1991-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -23,7 +23,7 @@ #define _TERMIOS_H 1 #include <features.h> -#if defined __USE_UNIX98 || defined __USE_XOPEN2K8 +#if defined __USE_XOPEN_EXTENDED || defined __USE_XOPEN2K8 /* We need `pid_t'. */ # include <bits/types.h> # ifndef __pid_t_defined @@ -94,7 +94,7 @@ extern int tcflush (int __fd, int __queue_selector) __THROW; extern int tcflow (int __fd, int __action) __THROW; -#if defined __USE_UNIX98 || defined __USE_XOPEN2K8 +#if defined __USE_XOPEN_EXTENDED || defined __USE_XOPEN2K8 /* Get process group ID for session leader for controlling terminal FD. */ extern __pid_t tcgetsid (int __fd) __THROW; #endif |