From: Tomas Valla <tom@ucw.cz>
Date: Tue, 18 Jan 2005 11:37:24 +0000 (+0000)
Subject: We should check the special case.
X-Git-Tag: holmes-import~838
X-Git-Url: http://mj.ucw.cz/gitweb/?a=commitdiff_plain;h=96083a2ec163374f6ac6ea48f15f551a0970e141;p=libucw.git

We should check the special case.
---

diff --git a/lib/lib.h b/lib/lib.h
index 07c66e9e..15cad210 100644
--- a/lib/lib.h
+++ b/lib/lib.h
@@ -2,6 +2,7 @@
  *	The UCW Library -- Miscellaneous Functions
  *
  *	(c) 1997--2004 Martin Mares <mj@ucw.cz>
+ *	(c) 2005 Tomas Valla <tom@ucw.cz>
  *
  *	This software may be freely distributed and used according to the terms
  *	of the GNU Lesser General Public License.
@@ -22,7 +23,7 @@
 #define OFFSETOF(s, i) ((unsigned int)&((s *)0)->i)
 #define SKIP_BACK(s, i, p) ((s *)((char *)p - OFFSETOF(s, i)))
 #define ALIGN(s, a) (((s)+a-1)&~(a-1))
-#define ALIGN_PTR(p, s) ((typeof(p)) ((addr_int_t)(p) + (s) - (addr_int_t)(p) % (s)))
+#define ALIGN_PTR(p, s) ( (s)>1 ? ((typeof(p)) ((addr_int_t)(p) + (s) - (addr_int_t)(p) % (s))) : (p) )
 #define UNALIGNED_PART(ptr, type) (((long) (ptr)) % sizeof(type))
 
 /* Some other macros */