Commit as 2.1.0.

[mLib] / bits.h

diff --git a/bits.h b/bits.h
index f6217ef46c536a121acc56c6e00e97b5136caac2..1b9f4856a03b67c204477db1def486b027f6d0d3 100644 (file)
--- a/bits.h
+++ b/bits.h
@@ -7,7 +7,7 @@
  * (c) 1998 Straylight/Edgeware
  */
 
-/*----- Licensing notice --------------------------------------------------* 
+/*----- Licensing notice --------------------------------------------------*
  *
  * This file is part of the mLib utilities library.
  *
@@ -15,12 +15,12 @@
  * it under the terms of the GNU Library General Public License as
  * published by the Free Software Foundation; either version 2 of the
  * License, or (at your option) any later version.
- * 
+ *
  * mLib is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Library General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Library General Public
  * License along with mLib; if not, write to the Free
  * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
@@ -188,14 +188,14 @@ typedef unsigned char octet, uint8;
      _(24, 24, 24) _(24, 24_L, 24l) _(24, 24_B, 24b)                   \
      _(32, 32, 32) _(32, 32_L, 32l) _(32, 32_B, 32b)                   \
      _(64, 64, 64) _(64, 64_L, 64l) _(64, 64_B, 64b)
-#  define DOINTSZ(_) _(8) _(16) _(24) _(32) _(64)
+#  define DOUINTSZ(_) _(8) _(16) _(24) _(32) _(64)
 #else
 #  define  DOUINTCONV(_)                                               \
      _(8, 8, 8)                                                                \
      _(16, 16, 16) _(16, 16_L, 16l) _(16, 16_B, 16b)                   \
      _(24, 24, 24) _(24, 24_L, 24l) _(24, 24_B, 24b)                   \
      _(32, 32, 32) _(32, 32_L, 32l) _(32, 32_B, 32b)
-#  define DOINTSZ(_) _(8) _(16) _(24) _(32)
+#  define DOUINTSZ(_) _(8) _(16) _(24) _(32)
 #endif
 
 /* --- Type coercions --- */
@@ -342,11 +342,11 @@ typedef unsigned char octet, uint8;
 
 #define LOAD24_B(p)                                                    \
   (((uint24)GETBYTE((p), 0) << 16) |                                   \
-   ((uint24)GETBYTE((p), 1) <<  8) |                                   \
-   ((uint24)GETBYTE((p), 2) <<  0))
+   ((uint24)GETBYTE((p), 1) << 8) |                                    \
+   ((uint24)GETBYTE((p), 2) << 0))
 #define LOAD24_L(p)                                                    \
-  (((uint24)GETBYTE((p), 0) <<  0) |                                   \
-   ((uint24)GETBYTE((p), 1) <<  8) |                                   \
+  (((uint24)GETBYTE((p), 0) << 0) |                                    \
+   ((uint24)GETBYTE((p), 1) << 8) |                                    \
    ((uint24)GETBYTE((p), 2) << 16))
 #define LOAD24(p) LOAD24_B((p))
 
@@ -363,11 +363,11 @@ typedef unsigned char octet, uint8;
 #define LOAD32_B(p)                                                    \
   (((uint32)GETBYTE((p), 0) << 24) |                                   \
    ((uint32)GETBYTE((p), 1) << 16) |                                   \
-   ((uint32)GETBYTE((p), 2) <<  8) |                                   \
-   ((uint32)GETBYTE((p), 3) <<  0))
+   ((uint32)GETBYTE((p), 2) << 8) |                                    \
+   ((uint32)GETBYTE((p), 3) << 0))
 #define LOAD32_L(p)                                                    \
-  (((uint32)GETBYTE((p), 0) <<  0) |                                   \
-   ((uint32)GETBYTE((p), 1) <<  8) |                                   \
+  (((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))
@@ -505,7 +505,7 @@ typedef unsigned char octet, uint8;
 #else
 #  define X64(x, y) { 0x##x, 0x##y }
 #endif
-    
+
 /*----- That's all, folks -------------------------------------------------*/
 
 #ifdef __cplusplus