-#define ALIGN_32U(x) (((x) | 0x1fU) +1)
-#define ALIGN_1024U(x) (((x) | 0x3ffU) +1)
-#define ALIGN_4096U(x) (((x) | 0xfffU) +1)
+#define ALIGN_32U(x) (((x)+(unsigned)31 ) & ~((unsigned)31))
+#define ALIGN_1024U(x) (((x)+(unsigned)1023) & ~((unsigned)1023))
+#define ALIGN_4096U(x) (((x)+(unsigned)4095) & ~((unsigned)4095))