use the underscore variants of _BYTE_ORDER which are always defined

even when various "strict" compiler options are used
ok deraadt millert

3 files changed, 23 insertions, 23 deletions

diff --git a/sys/sys/cdio.h b/sys/sys/cdio.h
index f77c97f2fa1..19034032cac 100644
--- a/sys/sys/cdio.h
+++ b/sys/sys/cdio.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cdio.h,v 1.13 2005/12/10 01:30:14 deraadt Exp $	*/
+/*	$OpenBSD: cdio.h,v 1.14 2006/04/27 02:17:21 tedu Exp $	*/
 /*	$NetBSD: cdio.h,v 1.11 1996/02/19 18:29:04 scottr Exp $	*/
 
 #ifndef _SYS_CDIO_H_
@@ -22,11 +22,11 @@ union msf_lba {
 
 struct cd_toc_entry {
 	u_char	nothing1;
-#if BYTE_ORDER == LITTLE_ENDIAN
+#if _BYTE_ORDER == _LITTLE_ENDIAN
 	u_int	control:4;
 	u_int	addr_type:4;
 #endif
-#if BYTE_ORDER == BIG_ENDIAN
+#if _BYTE_ORDER == _BIG_ENDIAN
 	u_int	addr_type:4;
 	u_int	control:4;
 #endif
@@ -49,11 +49,11 @@ struct cd_sub_channel_header {
 
 struct cd_sub_channel_q_data {
 	u_char	data_format;
-#if BYTE_ORDER == LITTLE_ENDIAN
+#if _BYTE_ORDER == _LITTLE_ENDIAN
 	u_int	control:4;
 	u_int	addr_type:4;
 #endif
-#if BYTE_ORDER == BIG_ENDIAN
+#if _BYTE_ORDER == _BIG_ENDIAN
 	u_int	addr_type:4;
 	u_int	control:4;
 #endif
@@ -61,20 +61,20 @@ struct cd_sub_channel_q_data {
 	u_char	index_number;
 	u_char	absaddr[4];
 	u_char	reladdr[4];
-#if BYTE_ORDER == LITTLE_ENDIAN
+#if _BYTE_ORDER == _LITTLE_ENDIAN
 	u_int	:7;
 	u_int	mc_valid:1;
 #endif
-#if BYTE_ORDER == BIG_ENDIAN
+#if _BYTE_ORDER == _BIG_ENDIAN
 	u_int	mc_valid:1;
 	u_int	:7;
 #endif
 	u_char	mc_number[15]; 
-#if BYTE_ORDER == LITTLE_ENDIAN
+#if _BYTE_ORDER == _LITTLE_ENDIAN
 	u_int	:7;
 	u_int	ti_valid:1;   
 #endif
-#if BYTE_ORDER == BIG_ENDIAN
+#if _BYTE_ORDER == _BIG_ENDIAN
 	u_int	ti_valid:1;   
 	u_int	:7;
 #endif
@@ -83,11 +83,11 @@ struct cd_sub_channel_q_data {
 
 struct cd_sub_channel_position_data {
 	u_char	data_format;
-#if BYTE_ORDER == LITTLE_ENDIAN
+#if _BYTE_ORDER == _LITTLE_ENDIAN
 	u_int	control:4;
 	u_int	addr_type:4;
 #endif
-#if BYTE_ORDER == BIG_ENDIAN
+#if _BYTE_ORDER == _BIG_ENDIAN
 	u_int	addr_type:4;
 	u_int	control:4;
 #endif
@@ -102,11 +102,11 @@ struct cd_sub_channel_media_catalog {
 	u_char	nothing1;
 	u_char	nothing2;
 	u_char	nothing3;
-#if BYTE_ORDER == LITTLE_ENDIAN
+#if _BYTE_ORDER == _LITTLE_ENDIAN
 	u_int	:7;
 	u_int	mc_valid:1;
 #endif
-#if BYTE_ORDER == BIG_ENDIAN
+#if _BYTE_ORDER == _BIG_ENDIAN
 	u_int	mc_valid:1;
 	u_int	:7;
 #endif
@@ -118,11 +118,11 @@ struct cd_sub_channel_track_info {
 	u_char	nothing1;
 	u_char	track_number;
 	u_char	nothing2;
-#if BYTE_ORDER == LITTLE_ENDIAN
+#if _BYTE_ORDER == _LITTLE_ENDIAN
 	u_int	:7;
 	u_int	ti_valid:1;
 #endif
-#if BYTE_ORDER == BIG_ENDIAN
+#if _BYTE_ORDER == _BIG_ENDIAN
 	u_int	ti_valid:1;
 	u_int	:7;
 #endif
diff --git a/sys/sys/systm.h b/sys/sys/systm.h
index af78933bc65..58220eb42f3 100644
--- a/sys/sys/systm.h
+++ b/sys/sys/systm.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: systm.h,v 1.68 2006/02/22 22:16:08 miod Exp $	*/
+/*	$OpenBSD: systm.h,v 1.69 2006/04/27 02:17:21 tedu Exp $	*/
 /*	$NetBSD: systm.h,v 1.50 1996/06/09 04:55:09 briggs Exp $	*/
 
 /*-
@@ -112,9 +112,9 @@ extern struct sysent {		/* system call table */
 	short	sy_argsize;	/* total size of arguments */
 	sy_call_t *sy_call;	/* implementing function */
 } sysent[];
-#if	BYTE_ORDER == BIG_ENDIAN
+#if	_BYTE_ORDER == _BIG_ENDIAN
 #define SCARG(p, k)	((p)->k.be.datum)	/* get arg from args pointer */
-#elif	BYTE_ORDER == LITTLE_ENDIAN
+#elif	_BYTE_ORDER == _LITTLE_ENDIAN
 #define SCARG(p, k)	((p)->k.le.datum)	/* get arg from args pointer */
 #else
 #error	"what byte order is this machine?"
diff --git a/sys/sys/wait.h b/sys/sys/wait.h
index 6a0e543c684..92ac596cdc7 100644
--- a/sys/sys/wait.h
+++ b/sys/sys/wait.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wait.h,v 1.13 2006/03/30 20:43:41 deraadt Exp $	*/
+/*	$OpenBSD: wait.h,v 1.14 2006/04/27 02:17:21 tedu Exp $	*/
 /*	$NetBSD: wait.h,v 1.11 1996/04/09 20:55:51 cgd Exp $	*/
 
 /*
@@ -107,13 +107,13 @@ union wait {
 	 * Terminated process status.
 	 */
 	struct {
-#if BYTE_ORDER == LITTLE_ENDIAN
+#if _BYTE_ORDER == _LITTLE_ENDIAN
 		unsigned int	w_Termsig:7,	/* termination signal */
 				w_Coredump:1,	/* core dump indicator */
 				w_Retcode:8,	/* exit code if w_termsig==0 */
 				w_Filler:16;	/* upper bits filler */
 #endif
-#if BYTE_ORDER == BIG_ENDIAN
+#if _BYTE_ORDER == _BIG_ENDIAN
 		unsigned int	w_Filler:16,	/* upper bits filler */
 				w_Retcode:8,	/* exit code if w_termsig==0 */
 				w_Coredump:1,	/* core dump indicator */
@@ -126,12 +126,12 @@ union wait {
 	 * with the WUNTRACED option bit.
 	 */
 	struct {
-#if BYTE_ORDER == LITTLE_ENDIAN
+#if _BYTE_ORDER == _LITTLE_ENDIAN
 		unsigned int	w_Stopval:8,	/* == W_STOPPED if stopped */
 				w_Stopsig:8,	/* signal that stopped us */
 				w_Filler:16;	/* upper bits filler */
 #endif
-#if BYTE_ORDER == BIG_ENDIAN
+#if _BYTE_ORDER == _BIG_ENDIAN
 		unsigned int	w_Filler:16,	/* upper bits filler */
 				w_Stopsig:8,	/* signal that stopped us */
 				w_Stopval:8;	/* == W_STOPPED if stopped */