X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;ds=sidebyside;f=lib%2Flib.h;h=554d9ecbd5d7b1561a12408b39058f8886faf529;hb=239f3fb07d3b69db82ddb097f16c495c6a289349;hp=27a7511b1308260c67196a23dc87a48fee16bc96;hpb=3b2012287b1980f81b43eb811dd3ffd79d565715;p=libucw.git diff --git a/lib/lib.h b/lib/lib.h index 27a7511b..554d9ecb 100644 --- a/lib/lib.h +++ b/lib/lib.h @@ -1,7 +1,7 @@ /* * The UCW Library -- Miscellaneous Functions * - * (c) 1997--2006 Martin Mares + * (c) 1997--2007 Martin Mares * (c) 2005 Tomas Valla * (c) 2006 Robert Spalek * @@ -15,12 +15,6 @@ #include "lib/config.h" #include -/* Tell libc we're going to use all extensions available */ - -#ifndef _GNU_SOURCE -#define _GNU_SOURCE -#endif - /* Macros for handling structurues, offsets and alignment */ #define CHECK_PTR_TYPE(x, type) ((x)-(type)(x) + (type)(x)) @@ -28,8 +22,8 @@ #define OFFSETOF(s, i) ((unsigned int) PTR_TO(s, i)) #define SKIP_BACK(s, i, p) ((s *)((char *)p - OFFSETOF(s, i))) #define ALIGN_TO(s, a) (((s)+a-1)&~(a-1)) -#define ALIGN_PTR(p, s) ((addr_int_t)(p) % (s) ? (typeof(p))((addr_int_t)(p) + (s) - (addr_int_t)(p) % (s)) : (p)) -#define UNALIGNED_PART(ptr, type) (((addr_int_t) (ptr)) % sizeof(type)) +#define ALIGN_PTR(p, s) ((uintptr_t)(p) % (s) ? (typeof(p))((uintptr_t)(p) + (s) - (uintptr_t)(p) % (s)) : (p)) +#define UNALIGNED_PART(ptr, type) (((uintptr_t) (ptr)) % sizeof(type)) /* Some other macros */ @@ -271,7 +265,7 @@ byte *str_unesc(byte *dest, byte *src); /* bigalloc.c */ -void *big_alloc(unsigned int len); -void big_free(void *start, unsigned int len); +void *big_alloc(u64 len); +void big_free(void *start, u64 len); #endif