about summary refs log tree commit diff
path: root/sysdeps/generic
diff options
context:
space:
mode:
authorThomas Bushnell, BSG <thomas@gnu.org>1996-07-09 05:02:06 +0000
committerThomas Bushnell, BSG <thomas@gnu.org>1996-07-09 05:02:06 +0000
commit18c75117c20d721af72a6cc1755520a7074db8cb (patch)
tree300ae7df61e30d7966e468eb0f98d41d1a73b6be /sysdeps/generic
parentf8fc0dd6495308582e5a098ee4488839779d6c55 (diff)
downloadglibc-18c75117c20d721af72a6cc1755520a7074db8cb.tar.gz
glibc-18c75117c20d721af72a6cc1755520a7074db8cb.tar.xz
glibc-18c75117c20d721af72a6cc1755520a7074db8cb.zip
*** empty log message ***
Tue Jul  9 00:14:52 1996  Michael I. Bushnell p/BSG  <mib@gnu.ai.mit.edu>

	* 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  <mib@gnu.ai.mit.edu>

	* 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.
Diffstat (limited to 'sysdeps/generic')
-rw-r--r--sysdeps/generic/termbits.h27
1 files changed, 27 insertions, 0 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