Manipulate file descriptor flags.

[mLib] / bits.h

diff --git a/bits.h b/bits.h
index 4da3026b237611bcfcd4ce99c0dc4145a1ea65c2..cc4d5165183d585ccc1a4832d8fab1615317dc27 100644 (file)
--- a/bits.h
+++ b/bits.h
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
- * $Id: bits.h,v 1.2 1999/06/17 00:12:46 mdw Exp $
+ * $Id: bits.h,v 1.3 1999/06/20 23:31:52 mdw Exp $
  *
  * Portable bit-level manipulation macros
  *
@@ -30,6 +30,9 @@
 /*----- Revision history --------------------------------------------------* 
  *
  * $Log: bits.h,v $
+ * Revision 1.3  1999/06/20 23:31:52  mdw
+ * More portability enhancements.
+ *
  * Revision 1.2  1999/06/17 00:12:46  mdw
  * Improve portability for shift and rotate macros.
  *
@@ -120,28 +123,44 @@ typedef unsigned char octet;
 #define LOAD8(p) (GETBYTE((p), 0))
 #define STORE8(p, v) (PUTBYTE((p), 0, (v)))
 
-#define LOAD16_B(p) ((GETBYTE((p), 0) << 8) | GETBYTE((p), 1))
-#define LOAD16_L(p) (GETBYTE((p), 0) | (GETBYTE((p), 1) << 8))
+#define LOAD16_B(p)                                                    \
+  (((uint16)GETBYTE((p), 0) << 8) |                                    \
+   ((uint16)GETBYTE((p), 1) << 0))
+#define LOAD16_L(p)                                                    \
+  (((uint16)GETBYTE((p), 0) << 0) |                                    \
+   ((uint16)GETBYTE((p), 1) << 8))
 #define LOAD16(p) LOAD16_B((p))
 
-#define STORE16_B(p, v) (PUTBYTE((p), 0, (v) >> 8), PUTBYTE((p), 1, (v)))
-#define STORE16_L(p, v) (PUTBYTE((p), 0, (v)), PUTBYTE((p), 1, (v) >> 8))
+#define STORE16_B(p, v)                                                        \
+  (PUTBYTE((p), 0, (uint16)(v) >> 8),                                  \
+   PUTBYTE((p), 1, (uint16)(v) >> 0))
+#define STORE16_L(p, v)                                                        \
+  (PUTBYTE((p), 0, (uint16)(v) >> 0),                                  \
+   PUTBYTE((p), 1, (uint16)(v) >> 8))
 #define STORE16(p, v) STORE16_B((p), (v))
 
 #define LOAD32_B(p)                                                    \
-  ((GETBYTE((p), 0) << 24) | (GETBYTE((p), 1) << 16) |                 \
-   (GETBYTE((p), 2) <<  8) | (GETBYTE((p), 3) <<  0))
+  (((uint32)GETBYTE((p), 0) << 24) |                                   \
+   ((uint32)GETBYTE((p), 1) << 16) |                                   \
+   ((uint32)GETBYTE((p), 2) <<  8) |                                   \
+   ((uint32)GETBYTE((p), 3) <<  0))
 #define LOAD32_L(p)                                                    \
-  ((GETBYTE((p), 0) <<  0) | (GETBYTE((p), 1) <<  8) |                 \
-   (GETBYTE((p), 2) << 16) | (GETBYTE((p), 3) << 24))
+  (((uint32)GETBYTE((p), 0) <<  0) |                                   \
+   ((uint32)GETBYTE((p), 1) <<  8) |                                   \
+   ((uint32)GETBYTE((p), 2) << 16) |                                   \
+   ((uint32)GETBYTE((p), 3) << 24))
 #define LOAD32(p) LOAD32_B((p))
 
 #define STORE32_B(p, v)                                                        \
-  (PUTBYTE((p), 0, (v) >> 24), PUTBYTE((p), 1, (v) >> 16),             \
-   PUTBYTE((p), 2, (v) >>  8), PUTBYTE((p), 3, (v) >>  0))
+  (PUTBYTE((p), 0, (uint32)(v) >> 24),                                 \
+   PUTBYTE((p), 1, (uint32)(v) >> 16),                                 \
+   PUTBYTE((p), 2, (uint32)(v) >>  8),                                 \
+   PUTBYTE((p), 3, (uint32)(v) >>  0))
 #define STORE32_L(p, v)                                                        \
-  (PUTBYTE((p), 0, (v) >>  0), PUTBYTE((p), 1, (v) >>  8),             \
-   PUTBYTE((p), 2, (v) >> 16), PUTBYTE((p), 3, (v) >> 24))
+  (PUTBYTE((p), 0, (uint32)(v) >>  0),                                 \
+   PUTBYTE((p), 1, (uint32)(v) >>  8),                                 \
+   PUTBYTE((p), 2, (uint32)(v) >> 16),                                 \
+   PUTBYTE((p), 3, (uint32)(v) >> 24))
 #define STORE32(p, v) STORE32_B((p), (v))
 
 /*----- That's all, folks -------------------------------------------------*/