Changeset e662a5f in mainline

Timestamp:

2009-02-17T22:44:56Z (16 years ago)

Author:

Martin Decky <martin@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

96e0748d

Parents:

6bf612b

Message:

add min and max macros

Location:

boot/generic

Files:

• align.h (modified) (1 diff)
• macros.h (modified) (1 diff)

boot/generic/align.h

@@ -27 +27 @@
  */
 
-/** @addtogroup generic 
+/** @addtogroup generic
  * @{
  */

boot/generic/macros.h

@@ -36 +36 @@
 #define BOOT_MACROS_H_
 
-#define SIZE2KB(size) ((size) >> 10)
-#define SIZE2MB(size) ((size) >> 20)
+#define min(a, b)  ((a) < (b) ? (a) : (b))
+#define max(a, b)  ((a) > (b) ? (a) : (b))
 
-#define KB2SIZE(kb) ((kb) << 10)
-#define MB2SIZE(mb) ((mb) << 20)
+#define SIZE2KB(size)  ((size) >> 10)
+#define SIZE2MB(size)  ((size) >> 20)
 
-#define STRING(arg) STRING_ARG(arg)
-#define STRING_ARG(arg) #arg
+#define KB2SIZE(kb)  ((kb) << 10)
+#define MB2SIZE(mb)  ((mb) << 20)
+
+#define STRING(arg)      STRING_ARG(arg)
+#define STRING_ARG(arg)  #arg
 
 #endif