From 18c75117c20d721af72a6cc1755520a7074db8cb Mon Sep 17 00:00:00 2001 From: "Thomas Bushnell, BSG" Date: Tue, 9 Jul 1996 05:02:06 +0000 Subject: *** empty log message *** Tue Jul 9 00:14:52 1996 Michael I. Bushnell p/BSG * sysdeps/mach/hurd/ioctls.h (MDMBUF, ECHO, TOSTOP, FLUSHO, PENDIN, NOFLSH): Undefine these at start if they are already defined to avoid collision with termbits.h. * sysdeps/generic/termbits.h (ECHO, TOSTOP, NOFLSH): Likewise. (MDMBUF, FLUSHO, PENDIN) [__USE_BSD]: Likewise. Mon Jul 8 13:10:50 1996 Michael I. Bushnell p/BSG * sysdeps/mach/hurd/errnos.awk: Skip entries where the error is 0. The "placeholder" entries recently added to errno.texi convert to zero since `???/' is at the front of them. * sysdeps/gnu/errlist.awk (errnoh): Likewise. * sysdeps/stub/setdomain.c (setdomainname): Declare NAME parm __const to conform with unistd.h. * posix/regex.c (re_comp, re_exec): Use weak_function as keyword in function defns instead of weak_symbol (NAME) after the defn. * stdlib/stdlib.h (random): Declare return type to be int32_t. --- sysdeps/mach/hurd/errnos.awk | 2 ++ sysdeps/mach/hurd/ioctls.h | 21 +++++++++++++++++++++ 2 files changed, 23 insertions(+) (limited to 'sysdeps/mach') 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 -- cgit v1.2.3