diff options
Diffstat (limited to 'sysdeps')
| -rw-r--r-- | sysdeps/generic/termbits.h | 27 | ||||
| -rw-r--r-- | sysdeps/gnu/errlist.awk | 2 | ||||
| -rw-r--r-- | sysdeps/mach/hurd/errnos.awk | 2 | ||||
| -rw-r--r-- | sysdeps/mach/hurd/ioctls.h | 21 | ||||
| -rw-r--r-- | sysdeps/stub/setdomain.c | 2 |
5 files changed, 53 insertions, 1 deletions
diff --git a/sysdeps/generic/termbits.h b/sysdeps/generic/termbits.h index 542f915d97..4181ba1f33 100644 --- a/sysdeps/generic/termbits.h +++ b/sysdeps/generic/termbits.h @@ -17,6 +17,33 @@ License along with the GNU C Library; see the file COPYING.LIB. If not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +/* These macros are also defined in some ioctls.h files (with numerically + identical values), but this serves to shut up cpp's complaining. */ +#ifdef __USE_BSD + +#ifdef MDMBUF +#undef MDMBUF +#endif +#ifdef FLUSHO +#undef FLUSHO +#endif +#ifdef PENDIN +#undef PENDIN +#endif + +#endif /* __USE_BSD */ + +#ifdef ECHO +#undef ECHO +#endif +#ifdef TOSTOP +#undef TOSTOP +#endif +#ifdef NOFLSH +#undef NOFLSH +#endif + + /* These definitions match those used by the 4.4 BSD kernel. If the operating system has termios system calls or ioctls that correctly implement the POSIX.1 behavior, there should be a diff --git a/sysdeps/gnu/errlist.awk b/sysdeps/gnu/errlist.awk index e6ca81a4ad..6c84b2e4f4 100644 --- a/sysdeps/gnu/errlist.awk +++ b/sysdeps/gnu/errlist.awk @@ -50,6 +50,8 @@ errnoh == 2 && $1 == "@deftypevr" && $2 == "Macro" && $3 == "int" \ errnoh == 3 && $1 == "@comment" && $2 == "errno" \ { errno = $3 + 0; + if (errno == 0) + next; if (alias[e]) printf "#if defined (%s) && %s != %s\n", e, e, alias[e]; else diff --git a/sysdeps/mach/hurd/errnos.awk b/sysdeps/mach/hurd/errnos.awk index 24a01ba935..5c88d11210 100644 --- a/sysdeps/mach/hurd/errnos.awk +++ b/sysdeps/mach/hurd/errnos.awk @@ -55,6 +55,8 @@ errnoh == 2 && $1 == "@deftypevr" && $2 == "Macro" && $3 == "int" \ errnoh == 3 && $1 == "@comment" && $2 == "errno" { errno = $3 + 0; + if (errno == 0) + next; if (errno > maxerrno) maxerrno = errno; if (e == "EWOULDBLOCK") { diff --git a/sysdeps/mach/hurd/ioctls.h b/sysdeps/mach/hurd/ioctls.h index 8036fd700d..f6bb4b4ce7 100644 --- a/sysdeps/mach/hurd/ioctls.h +++ b/sysdeps/mach/hurd/ioctls.h @@ -20,6 +20,27 @@ Cambridge, MA 02139, USA. */ #define _IOCTLS_H 1 +/* These macros are also defined in termbits.h (with numerically + identical values) but this serves to shut up cpp's complaining. */ +#ifdef MDMBUF +#undef MDMBUF +#endif +#ifdef ECHO +#undef ECHO +#endif +#ifdef TOSTOP +#undef TOSTOP +#endif +#ifdef FLUSHO +#undef FLUSHO +#endif +#ifdef PENDIN +#undef PENDIN +#endif +#ifdef NOFLSH +#undef NOFLSH +#endif + /* Hurd ioctl request are made up of several fields: 10987654321098765432109876543210 diff --git a/sysdeps/stub/setdomain.c b/sysdeps/stub/setdomain.c index 74da5398b5..052b45b9bc 100644 --- a/sysdeps/stub/setdomain.c +++ b/sysdeps/stub/setdomain.c @@ -24,7 +24,7 @@ Cambridge, MA 02139, USA. */ This call is restricted to the super-user. */ int DEFUN(setdomainname, (name, len), - char *name AND size_t len) + __const char *name AND size_t len) { errno = ENOSYS; return -1; |