Update.

1999-12-03  Ulrich Drepper  <drepper@cygnus.com>

	* sysdeps/generic/bits/stropts.h: Update with LiS types and
	values.  Patch by David Grothe <dave@gcom.com>.

	* sysdeps/unix/sysv/linux/bits/types.h (__t_scalar_t, __t_uscalar_t):
	Make long types.
	* sysdeps/unix/sysv/linux/alpha/bits/types.h: Likewise.
	* sysdeps/unix/sysv/linux/mips/bits/types.h: Likewise.
	* sysdeps/unix/sysv/linux/sparc/bits/types.h: Likewise.

7 files changed, 181 insertions, 154 deletions

diff --git a/ChangeLog b/ChangeLog
index aff4631..4153842 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+1999-12-03  Ulrich Drepper  <drepper@cygnus.com>
+
+	* sysdeps/generic/bits/stropts.h: Update with LiS types and
+	values.  Patch by David Grothe <dave@gcom.com>.
+
+	* sysdeps/unix/sysv/linux/bits/types.h (__t_scalar_t, __t_uscalar_t):
+	Make long types.
+	* sysdeps/unix/sysv/linux/alpha/bits/types.h: Likewise.
+	* sysdeps/unix/sysv/linux/mips/bits/types.h: Likewise.
+	* sysdeps/unix/sysv/linux/sparc/bits/types.h: Likewise.
+
 1999-12-02  Akira Yoshiyama  <yosshy@debian.or.jp>
 
 	* locale/lc-time.c (_nl_get_era_entry): Separate eras
diff --git a/bits/stropts.h b/bits/stropts.h
index 026df21..ed80747 100644
--- a/bits/stropts.h
+++ b/bits/stropts.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1998 Free Software Foundation, Inc.
+/* Copyright (C) 1998, 1999 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
@@ -22,133 +22,140 @@
 #include <bits/types.h>
 
 /* Macros used as `request' argument to `ioctl'.  */
-#define I_PUSH		1	/* Push STREAMS module onto top of the current
+#define __SID		('S' << 8)
+
+#define I_NREAD	    (__SID | 1)	/* Counts the number of data bytes in the data
+				   block in the first message.  */
+#define I_PUSH	    (__SID | 2)	/* Push STREAMS module onto top of the current
 				   STREAM, just below the STREAM head.  */
-#define I_POP		2	/* Remove STREAMS module from just below the
+#define I_POP	    (__SID | 3)	/* Remove STREAMS module from just below the
 				   STREAM head.  */
-#define I_LOOK		3	/* Retrieve the name of the module just below
+#define I_LOOK	    (__SID | 4)	/* Retrieve the name of the module just below
 				   the STREAM head and place it in a character
 				   string.  */
-#define I_FLUSH		4	/* Flush all input and/or output.  */
-#define I_FLUSHBAND	5	/* Flush only band specified.  */
-#define I_SETSIG	6	/* Inform the STREAM head that the process
+#define I_FLUSH	    (__SID | 5)	/* Flush all input and/or output.  */
+#define I_SRDOPT    (__SID | 6)	/* Sets the read mode.  */
+#define I_GRDOPT    (__SID | 7)	/* Returns the current read mode setting.  */
+#define I_STR	    (__SID | 8)	/* Construct an internal STREAMS `ioctl'
+				   message and send that message downstream. */
+#define I_SETSIG    (__SID | 9)	/* Inform the STREAM head that the process
 				   wants the SIGPOLL signal issued.  */
-#define I_GETSIG	7	/* Return the events for which the calling
+#define I_GETSIG    (__SID |10) /* Return the events for which the calling
 				   process is currently registered to be sent
 				   a SIGPOLL signal.  */
-#define I_FIND		8	/* Compares the names of all modules currently
+#define I_FIND	    (__SID |11) /* Compares the names of all modules currently
 				   present in the STREAM to the name pointed to
 				   by `arg'.  */
-#define I_PEEK		9	/* Allows a process to retrieve the information
+#define I_LINK	    (__SID |12) /* Connect two STREAMs.  */
+#define I_UNLINK    (__SID |13) /* Disconnects the two STREAMs.  */
+#define I_PEEK	    (__SID |15) /* Allows a process to retrieve the information
 				   in the first message on the STREAM head read
 				   queue without taking the message off the
 				   queue.  */
-#define I_SRDOPT	10	/* Sets the read mode.  */
-#define I_GRDOPT	11	/* Returns the current read mode setting.  */
-#define I_NREAD		12	/* Counts the number of data bytes in the data
-				   block in the first message.  */
-#define I_FDINSERT	13	/* Create a message from the specified
+#define I_FDINSERT  (__SID |16) /* Create a message from the specified
 				   buffer(s), adds information about another
 				   STREAM, and send the message downstream.  */
-#define I_STR		14	/* Construct an internal STREAMS `ioctl'
-				   message and send that message downstream. */
-#define I_SWROPT	15	/* Set the write mode.  */
-#define I_GWRSET	16	/* Return the current write mode setting.  */
-#define I_SENDFD	17	/* Requests the STREAM associated with `fildes'
+#define I_SENDFD    (__SID |17) /* Requests the STREAM associated with `fildes'
 				   to send a message, containing a file
 				   pointer, to the STREAM head at the other end
 				   of a STREAMS pipe.  */
-#define I_RECVFD	18	/* Retrieve the file descriptor associated with
-				   the message sent by an I_SENDFD `ioctl'
-				   over a STREAMS pipe.  */
-#define I_LIST		19	/* List all the module names on the STREAM, up
+#define I_RECVFD    (__SID |14) /* Non-EFT definition.  */
+#define I_SWROPT    (__SID |19) /* Set the write mode.  */
+#define I_GWRSET    (__SID |20) /* Return the current write mode setting.  */
+#define I_LIST	    (__SID |21) /* List all the module names on the STREAM, up
 				   to and including the topmost driver name. */
-#define I_ATMARK	20	/* See if the current message on the STREAM
-				   head read queue is "marked" by some module
-				   downstream.  */
-#define I_CKBAND	21	/* Check if the message of a given priority
+#define I_PLINK	    (__SID |22) /* Connect two STREAMs with a persistent
+				   link.  */
+#define I_PUNLINK   (__SID |23) /* Disconnect the two STREAMs that were
+				   connected with a persistent link.  */
+#define I_FLUSHBAND (__SID |28) /* Flush only band specified.  */
+#define I_CKBAND    (__SID |29) /* Check if the message of a given priority
 				   band exists on the STREAM head read
 				   queue.  */
-#define I_GETBAND	22	/* Return the priority band of the first
+#define I_GETBAND   (__SID |30) /* Return the priority band of the first
 				   message on the STREAM head read queue.  */
-#define I_CANPUT	23	/* Check if a certain band is writable.  */
-#define I_SETCLTIME	24	/* Set the time the STREAM head will delay when
+#define I_ATMARK    (__SID |31) /* See if the current message on the STREAM
+				   head read queue is "marked" by some module
+				   downstream.  */
+#define I_SETCLTIME (__SID |32) /* Set the time the STREAM head will delay when
 				   a STREAM is closing and there is data on
 				   the write queues.  */
-#define I_LINK		25	/* Connect two STREAMs.  */
-#define I_UNLINK	26	/* Disconnects the two STREAMs.  */
-#define I_PLINK		27	/* Connect two STREAMs with a persistent
-				   link.  */
-#define I_PUNLINK	28	/* Disconnect the two STREAMs that were
-				   connected with a persistent link.  */
+#define I_GETCLTIME (__SID |33) /* Get current value for closing timeout.  */
+#define I_CANPUT    (__SID |34) /* Check if a certain band is writable.  */
 
 
 /* Used in `I_LOOK' request.  */
-#define FMNAMESZ	255
+#define FMNAMESZ	8	/* compatibility w/UnixWare/Solaris.  */
 
 /* Flush options.  */
-#define FLUSHR	1		/* Flush read queues.  */
-#define FLUSHW	2		/* Flush write queues.  */
-#define FLUSHRW	3		/* Flush read and write queues.  */
+#define FLUSHR		0x01	/* Flush read queues.  */
+#define FLUSHW		0x02	/* Flush write queues.  */
+#define FLUSHRW		0x03	/* Flush read and write queues.  */
+#define FLUSHBAND	0x04	/* Flush only specified band.  */
 
 /* Possible arguments for `I_SETSIG'.  */
-#define S_RDNORM	0x0001	/* A normal message has arrived.  */
-#define S_RDBAND	0x0002	/* A message with a non-zero priority has
-				   arrived.  */
-#define S_INPUT		0x0004	/* A message, other than a high-priority
+#define S_INPUT		0x0001	/* A message, other than a high-priority
 				   message, has arrived.  */
-#define S_HIPRI		0x0008	/* A high-priority message is present.  */
-#define S_OUTPUT	0x0010	/* The write queue for normal data is no longer
+#define S_HIPRI		0x0002	/* A high-priority message is present.  */
+#define S_OUTPUT	0x0004	/* The write queue for normal data is no longer
 				   full.  */
-#define S_WRNORM	S_OUTPUT
-#define S_WRBAND	0x0020	/* The write queue for a non-zero priority
-				   band is no longer full.  */
-#define S_MSG		0x0040	/* A STREAMS signal message that contains the
+#define S_MSG		0x0008	/* A STREAMS signal message that contains the
 				   SIGPOLL signal reaches the front of the
 				   STREAM head read queue.  */
-#define S_ERROR		0x0080	/* Notification of an error condition.  */
-#define S_HANGUP	0x0100	/* Notification of a hangup.  */
+#define S_ERROR		0x0010	/* Notification of an error condition.  */
+#define S_HANGUP	0x0020	/* Notification of a hangup.  */
+#define S_RDNORM	0x0040	/* A normal message has arrived.  */
+#define S_WRNORM	S_OUTPUT
+#define S_RDBAND	0x0080	/* A message with a non-zero priority has
+				   arrived.  */
+#define S_WRBAND	0x0100	/* The write queue for a non-zero priority
+				   band is no longer full.  */
 #define S_BANDURG	0x0200	/* When used in conjunction with S_RDBAND,
 				   SIGURG is generated instead of SIGPOLL when
 				   a priority message reaches the front of the
 				   STREAM head read queue.  */
 
 /* Option for `I_PEEK'.  */
-#define RS_HIPRI	1	/* Only look for high-priority messages.  */
+#define RS_HIPRI	0x01	/* Only look for high-priority messages.  */
 
 /* Options for `I_SRDOPT'.  */
-#define RDNORM		1	/* Byte-STREAM mode, the default.  */
-#define RMSGD		2	/* Message-discard mode.   */
-#define RMSGN		3	/* Message-nondiscard mode.   */
-#define RPROTNORM	4	/* Fail `read' with EBADMSG if a message
-				   containing a control part is at the front
-				   of the STREAM head read queue.  */
-#define RPROTDAT	5	/* Deliver the control part of a message as
+#define RNORM		0x0000	/* Byte-STREAM mode, the default.  */
+#define RMSGD		0x0001	/* Message-discard mode.   */
+#define RMSGN		0x0002	/* Message-nondiscard mode.   */
+#define RPROTDAT	0x0004	/* Deliver the control part of a message as
 				   data.  */
-#define RPROTDIS	6	/* Discard the control part of a message,
+#define RPROTDIS	0x0008	/* Discard the control part of a message,
 				   delivering any data part.  */
+#define RPROTNORM	0x0010	/* Fail `read' with EBADMSG if a message
+				   containing a control part is at the front
+				   of the STREAM head read queue.  */
+#define RPROTMASK	0x001C	/* The RPROT bits */
 
 /* Possible mode for `I_SWROPT'.  */
-#define SNDZERO		1	/* Send a zero-length message downstream when a
+#define SNDZERO		0x001	/* Send a zero-length message downstream when a
 				   `write' of 0 bytes occurs.  */
+#define	SNDPIPE		0x002	/* Send SIGPIPE on write and putmsg if
+				   sd_werror is set.  */
 
 /* Arguments for `I_ATMARK'.  */
-#define ANYMARK		1	/* Check if the message is marked.  */
-#define LASTMARK	2	/* Check if the message is the last one marked
+#define ANYMARK		0x01	/* Check if the message is marked.  */
+#define LASTMARK	0x02	/* Check if the message is the last one marked
 				   on the queue.  */
 
 /* Argument for `I_UNLINK'.  */
-#define MUXID_ALL	1	/* Unlink all STREAMs linked to the STREAM
+#define MUXID_ALL	(-1)	/* Unlink all STREAMs linked to the STREAM
 				   associated with `fildes'.  */
 
 
 /* Macros for `getmsg', `getpmsg', `putmsg' and `putpmsg'.  */
-#define MSG_ANY		1	/* Receive any message.  */
-#define MSG_BAND	2	/* Receive message from specified band.  */
-#define MSG_HIPRI	3	/* Send/receive high priority message.  */
-#define MORECTL		4	/* More control information is left in
+#define MSG_HIPRI	0x01	/* Send/receive high priority message.  */
+#define MSG_ANY		0x02	/* Receive any message.  */
+#define MSG_BAND	0x04	/* Receive message from specified band.  */
+
+/* Values returned by getmsg and getpmsg */
+#define MORECTL		1	/* More control information is left in
 				   message.  */
-#define MOREDATA	5	/* More data is left in message.  */
+#define MOREDATA	2	/* More data is left in message.  */
 
 
 /* Structure used for the I_FLUSHBAND ioctl on streams.  */
@@ -169,14 +176,14 @@ struct strpeek
   {
     struct strbuf ctlbuf;
     struct strbuf databuf;
-    __t_uscalar_t flags;
+    __t_uscalar_t flags;		/* UnixWare/Solaris compatibility.  */
   };
 
 struct strfdinsert
   {
     struct strbuf ctlbuf;
     struct strbuf databuf;
-    __t_uscalar_t flags;
+    __t_uscalar_t flags;		/* UnixWare/Solaris compatibility.  */
     int fildes;
     int offset;
   };
@@ -194,6 +201,7 @@ struct strrecvfd
     int fd;
     __uid_t uid;
     __gid_t gid;
+    char fill[8];			/* UnixWare/Solaris compatibility */
   };
 
 
diff --git a/sysdeps/generic/bits/stropts.h b/sysdeps/generic/bits/stropts.h
index 026df21..ed80747 100644
--- a/sysdeps/generic/bits/stropts.h
+++ b/sysdeps/generic/bits/stropts.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1998 Free Software Foundation, Inc.
+/* Copyright (C) 1998, 1999 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
@@ -22,133 +22,140 @@
 #include <bits/types.h>
 
 /* Macros used as `request' argument to `ioctl'.  */
-#define I_PUSH		1	/* Push STREAMS module onto top of the current
+#define __SID		('S' << 8)
+
+#define I_NREAD	    (__SID | 1)	/* Counts the number of data bytes in the data
+				   block in the first message.  */
+#define I_PUSH	    (__SID | 2)	/* Push STREAMS module onto top of the current
 				   STREAM, just below the STREAM head.  */
-#define I_POP		2	/* Remove STREAMS module from just below the
+#define I_POP	    (__SID | 3)	/* Remove STREAMS module from just below the
 				   STREAM head.  */
-#define I_LOOK		3	/* Retrieve the name of the module just below
+#define I_LOOK	    (__SID | 4)	/* Retrieve the name of the module just below
 				   the STREAM head and place it in a character
 				   string.  */
-#define I_FLUSH		4	/* Flush all input and/or output.  */
-#define I_FLUSHBAND	5	/* Flush only band specified.  */
-#define I_SETSIG	6	/* Inform the STREAM head that the process
+#define I_FLUSH	    (__SID | 5)	/* Flush all input and/or output.  */
+#define I_SRDOPT    (__SID | 6)	/* Sets the read mode.  */
+#define I_GRDOPT    (__SID | 7)	/* Returns the current read mode setting.  */
+#define I_STR	    (__SID | 8)	/* Construct an internal STREAMS `ioctl'
+				   message and send that message downstream. */
+#define I_SETSIG    (__SID | 9)	/* Inform the STREAM head that the process
 				   wants the SIGPOLL signal issued.  */
-#define I_GETSIG	7	/* Return the events for which the calling
+#define I_GETSIG    (__SID |10) /* Return the events for which the calling
 				   process is currently registered to be sent
 				   a SIGPOLL signal.  */
-#define I_FIND		8	/* Compares the names of all modules currently
+#define I_FIND	    (__SID |11) /* Compares the names of all modules currently
 				   present in the STREAM to the name pointed to
 				   by `arg'.  */
-#define I_PEEK		9	/* Allows a process to retrieve the information
+#define I_LINK	    (__SID |12) /* Connect two STREAMs.  */
+#define I_UNLINK    (__SID |13) /* Disconnects the two STREAMs.  */
+#define I_PEEK	    (__SID |15) /* Allows a process to retrieve the information
 				   in the first message on the STREAM head read
 				   queue without taking the message off the
 				   queue.  */
-#define I_SRDOPT	10	/* Sets the read mode.  */
-#define I_GRDOPT	11	/* Returns the current read mode setting.  */
-#define I_NREAD		12	/* Counts the number of data bytes in the data
-				   block in the first message.  */
-#define I_FDINSERT	13	/* Create a message from the specified
+#define I_FDINSERT  (__SID |16) /* Create a message from the specified
 				   buffer(s), adds information about another
 				   STREAM, and send the message downstream.  */
-#define I_STR		14	/* Construct an internal STREAMS `ioctl'
-				   message and send that message downstream. */
-#define I_SWROPT	15	/* Set the write mode.  */
-#define I_GWRSET	16	/* Return the current write mode setting.  */
-#define I_SENDFD	17	/* Requests the STREAM associated with `fildes'
+#define I_SENDFD    (__SID |17) /* Requests the STREAM associated with `fildes'
 				   to send a message, containing a file
 				   pointer, to the STREAM head at the other end
 				   of a STREAMS pipe.  */
-#define I_RECVFD	18	/* Retrieve the file descriptor associated with
-				   the message sent by an I_SENDFD `ioctl'
-				   over a STREAMS pipe.  */
-#define I_LIST		19	/* List all the module names on the STREAM, up
+#define I_RECVFD    (__SID |14) /* Non-EFT definition.  */
+#define I_SWROPT    (__SID |19) /* Set the write mode.  */
+#define I_GWRSET    (__SID |20) /* Return the current write mode setting.  */
+#define I_LIST	    (__SID |21) /* List all the module names on the STREAM, up
 				   to and including the topmost driver name. */
-#define I_ATMARK	20	/* See if the current message on the STREAM
-				   head read queue is "marked" by some module
-				   downstream.  */
-#define I_CKBAND	21	/* Check if the message of a given priority
+#define I_PLINK	    (__SID |22) /* Connect two STREAMs with a persistent
+				   link.  */
+#define I_PUNLINK   (__SID |23) /* Disconnect the two STREAMs that were
+				   connected with a persistent link.  */
+#define I_FLUSHBAND (__SID |28) /* Flush only band specified.  */
+#define I_CKBAND    (__SID |29) /* Check if the message of a given priority
 				   band exists on the STREAM head read
 				   queue.  */
-#define I_GETBAND	22	/* Return the priority band of the first
+#define I_GETBAND   (__SID |30) /* Return the priority band of the first
 				   message on the STREAM head read queue.  */
-#define I_CANPUT	23	/* Check if a certain band is writable.  */
-#define I_SETCLTIME	24	/* Set the time the STREAM head will delay when
+#define I_ATMARK    (__SID |31) /* See if the current message on the STREAM
+				   head read queue is "marked" by some module
+				   downstream.  */
+#define I_SETCLTIME (__SID |32) /* Set the time the STREAM head will delay when
 				   a STREAM is closing and there is data on
 				   the write queues.  */
-#define I_LINK		25	/* Connect two STREAMs.  */
-#define I_UNLINK	26	/* Disconnects the two STREAMs.  */
-#define I_PLINK		27	/* Connect two STREAMs with a persistent
-				   link.  */
-#define I_PUNLINK	28	/* Disconnect the two STREAMs that were
-				   connected with a persistent link.  */
+#define I_GETCLTIME (__SID |33) /* Get current value for closing timeout.  */
+#define I_CANPUT    (__SID |34) /* Check if a certain band is writable.  */
 
 
 /* Used in `I_LOOK' request.  */
-#define FMNAMESZ	255
+#define FMNAMESZ	8	/* compatibility w/UnixWare/Solaris.  */
 
 /* Flush options.  */
-#define FLUSHR	1		/* Flush read queues.  */
-#define FLUSHW	2		/* Flush write queues.  */
-#define FLUSHRW	3		/* Flush read and write queues.  */
+#define FLUSHR		0x01	/* Flush read queues.  */
+#define FLUSHW		0x02	/* Flush write queues.  */
+#define FLUSHRW		0x03	/* Flush read and write queues.  */
+#define FLUSHBAND	0x04	/* Flush only specified band.  */
 
 /* Possible arguments for `I_SETSIG'.  */
-#define S_RDNORM	0x0001	/* A normal message has arrived.  */
-#define S_RDBAND	0x0002	/* A message with a non-zero priority has
-				   arrived.  */
-#define S_INPUT		0x0004	/* A message, other than a high-priority
+#define S_INPUT		0x0001	/* A message, other than a high-priority
 				   message, has arrived.  */
-#define S_HIPRI		0x0008	/* A high-priority message is present.  */
-#define S_OUTPUT	0x0010	/* The write queue for normal data is no longer
+#define S_HIPRI		0x0002	/* A high-priority message is present.  */
+#define S_OUTPUT	0x0004	/* The write queue for normal data is no longer
 				   full.  */
-#define S_WRNORM	S_OUTPUT
-#define S_WRBAND	0x0020	/* The write queue for a non-zero priority
-				   band is no longer full.  */
-#define S_MSG		0x0040	/* A STREAMS signal message that contains the
+#define S_MSG		0x0008	/* A STREAMS signal message that contains the
 				   SIGPOLL signal reaches the front of the
 				   STREAM head read queue.  */
-#define S_ERROR		0x0080	/* Notification of an error condition.  */
-#define S_HANGUP	0x0100	/* Notification of a hangup.  */
+#define S_ERROR		0x0010	/* Notification of an error condition.  */
+#define S_HANGUP	0x0020	/* Notification of a hangup.  */
+#define S_RDNORM	0x0040	/* A normal message has arrived.  */
+#define S_WRNORM	S_OUTPUT
+#define S_RDBAND	0x0080	/* A message with a non-zero priority has
+				   arrived.  */
+#define S_WRBAND	0x0100	/* The write queue for a non-zero priority
+				   band is no longer full.  */
 #define S_BANDURG	0x0200	/* When used in conjunction with S_RDBAND,
 				   SIGURG is generated instead of SIGPOLL when
 				   a priority message reaches the front of the
 				   STREAM head read queue.  */
 
 /* Option for `I_PEEK'.  */
-#define RS_HIPRI	1	/* Only look for high-priority messages.  */
+#define RS_HIPRI	0x01	/* Only look for high-priority messages.  */
 
 /* Options for `I_SRDOPT'.  */
-#define RDNORM		1	/* Byte-STREAM mode, the default.  */
-#define RMSGD		2	/* Message-discard mode.   */
-#define RMSGN		3	/* Message-nondiscard mode.   */
-#define RPROTNORM	4	/* Fail `read' with EBADMSG if a message
-				   containing a control part is at the front
-				   of the STREAM head read queue.  */
-#define RPROTDAT	5	/* Deliver the control part of a message as
+#define RNORM		0x0000	/* Byte-STREAM mode, the default.  */
+#define RMSGD		0x0001	/* Message-discard mode.   */
+#define RMSGN		0x0002	/* Message-nondiscard mode.   */
+#define RPROTDAT	0x0004	/* Deliver the control part of a message as
 				   data.  */
-#define RPROTDIS	6	/* Discard the control part of a message,
+#define RPROTDIS	0x0008	/* Discard the control part of a message,
 				   delivering any data part.  */
+#define RPROTNORM	0x0010	/* Fail `read' with EBADMSG if a message
+				   containing a control part is at the front
+				   of the STREAM head read queue.  */
+#define RPROTMASK	0x001C	/* The RPROT bits */
 
 /* Possible mode for `I_SWROPT'.  */
-#define SNDZERO		1	/* Send a zero-length message downstream when a
+#define SNDZERO		0x001	/* Send a zero-length message downstream when a
 				   `write' of 0 bytes occurs.  */
+#define	SNDPIPE		0x002	/* Send SIGPIPE on write and putmsg if
+				   sd_werror is set.  */
 
 /* Arguments for `I_ATMARK'.  */
-#define ANYMARK		1	/* Check if the message is marked.  */
-#define LASTMARK	2	/* Check if the message is the last one marked
+#define ANYMARK		0x01	/* Check if the message is marked.  */
+#define LASTMARK	0x02	/* Check if the message is the last one marked
 				   on the queue.  */
 
 /* Argument for `I_UNLINK'.  */
-#define MUXID_ALL	1	/* Unlink all STREAMs linked to the STREAM
+#define MUXID_ALL	(-1)	/* Unlink all STREAMs linked to the STREAM
 				   associated with `fildes'.  */
 
 
 /* Macros for `getmsg', `getpmsg', `putmsg' and `putpmsg'.  */
-#define MSG_ANY		1	/* Receive any message.  */
-#define MSG_BAND	2	/* Receive message from specified band.  */
-#define MSG_HIPRI	3	/* Send/receive high priority message.  */
-#define MORECTL		4	/* More control information is left in
+#define MSG_HIPRI	0x01	/* Send/receive high priority message.  */
+#define MSG_ANY		0x02	/* Receive any message.  */
+#define MSG_BAND	0x04	/* Receive message from specified band.  */
+
+/* Values returned by getmsg and getpmsg */
+#define MORECTL		1	/* More control information is left in
 				   message.  */
-#define MOREDATA	5	/* More data is left in message.  */
+#define MOREDATA	2	/* More data is left in message.  */
 
 
 /* Structure used for the I_FLUSHBAND ioctl on streams.  */
@@ -169,14 +176,14 @@ struct strpeek
   {
     struct strbuf ctlbuf;
     struct strbuf databuf;
-    __t_uscalar_t flags;
+    __t_uscalar_t flags;		/* UnixWare/Solaris compatibility.  */
   };
 
 struct strfdinsert
   {
     struct strbuf ctlbuf;
     struct strbuf databuf;
-    __t_uscalar_t flags;
+    __t_uscalar_t flags;		/* UnixWare/Solaris compatibility.  */
     int fildes;
     int offset;
   };
@@ -194,6 +201,7 @@ struct strrecvfd
     int fd;
     __uid_t uid;
     __gid_t gid;
+    char fill[8];			/* UnixWare/Solaris compatibility */
   };
 
 
diff --git a/sysdeps/unix/sysv/linux/alpha/bits/types.h b/sysdeps/unix/sysv/linux/alpha/bits/types.h
index d55fee3..8a79621 100644
--- a/sysdeps/unix/sysv/linux/alpha/bits/types.h
+++ b/sysdeps/unix/sysv/linux/alpha/bits/types.h
@@ -117,8 +117,8 @@ typedef struct
   } __fd_set;
 
 /* Used in XTI.  */
-typedef int __t_scalar_t;
-typedef unsigned int __t_uscalar_t;
+typedef long int __t_scalar_t;
+typedef unsigned long int __t_uscalar_t;
 
 /* Duplicates info from stdint.h but this is used in unistd.h.  */
 typedef long int __intptr_t;
diff --git a/sysdeps/unix/sysv/linux/bits/types.h b/sysdeps/unix/sysv/linux/bits/types.h
index a73afee..45286ea 100644
--- a/sysdeps/unix/sysv/linux/bits/types.h
+++ b/sysdeps/unix/sysv/linux/bits/types.h
@@ -143,8 +143,8 @@ typedef __u_long __ino64_t;
 typedef __loff_t __off64_t;
 
 /* Used in XTI.  */
-typedef int __t_scalar_t;
-typedef unsigned int __t_uscalar_t;
+typedef long int __t_scalar_t;
+typedef unsigned long int __t_uscalar_t;
 
 /* Duplicates info from stdint.h but this is used in unistd.h.  */
 typedef int __intptr_t;
diff --git a/sysdeps/unix/sysv/linux/mips/bits/types.h b/sysdeps/unix/sysv/linux/mips/bits/types.h
index a52bb80..48a9bf0 100644
--- a/sysdeps/unix/sysv/linux/mips/bits/types.h
+++ b/sysdeps/unix/sysv/linux/mips/bits/types.h
@@ -143,8 +143,8 @@ typedef __u_long __ino64_t;
 typedef __loff_t __off64_t;
 
 /* Used in XTI.  */
-typedef int __t_scalar_t;
-typedef unsigned int __t_uscalar_t;
+typedef long int __t_scalar_t;
+typedef unsigned long int __t_uscalar_t;
 
 /* Duplicates info from stdint.h but this is used in unistd.h.  */
 typedef int __intptr_t;
diff --git a/sysdeps/unix/sysv/linux/sparc/bits/types.h b/sysdeps/unix/sysv/linux/sparc/bits/types.h
index ad217bf..de08560 100644
--- a/sysdeps/unix/sysv/linux/sparc/bits/types.h
+++ b/sysdeps/unix/sysv/linux/sparc/bits/types.h
@@ -163,8 +163,8 @@ typedef unsigned long int __fsfilcnt_t;
 typedef __u_quad_t __fsfilcnt64_t;
 
 /* Used in XTI.  */
-typedef int __t_scalar_t;
-typedef unsigned int __t_uscalar_t;
+typedef long int __t_scalar_t;
+typedef unsigned long int __t_uscalar_t;
 
 /* Duplicates info from stdint.h but this is used in unistd.h.  */
 #if __WORDSIZE == 64