Index: uspace/lib/c/include/align.h
===================================================================
--- uspace/lib/c/include/align.h	(revision 1e221ec5786e856097fa812262716462c14fad14)
+++ uspace/lib/c/include/align.h	(revision 096c0786530d26ecc60b3c63b61e396df267c704)
@@ -41,5 +41,5 @@
  * @param a		Size of alignment, must be power of 2.
  */
-#define ALIGN_DOWN(s, a)	((s) & ~((a) - 1))
+#define ALIGN_DOWN(s, a)	((s) & ~((typeof(s))(a) - 1))
 
 /** Align to the nearest higher address which is a power of two.
@@ -48,5 +48,5 @@
  * @param a		Size of alignment, must be power of 2.
  */
-#define ALIGN_UP(s, a)		((long)((s) + ((a) - 1)) & ~((long) (a) - 1))
+#define ALIGN_UP(s, a)		((((s) + ((a) - 1)) & ~((typeof(s))(a) - 1)))
 
 /** Round up to the nearest higher boundary.