changed OFFSETOF again

[libucw.git] / ucw / lib.h

diff --git a/ucw/lib.h b/ucw/lib.h
index e4352ee85d9e7a675262e839b15302a1e164b0c7..99b848e348c4d1cd0ce3aa1cab85d2f20d3bf9ee 100644 (file)
--- a/ucw/lib.h
+++ b/ucw/lib.h
@@ -20,7 +20,7 @@
 
 #define CHECK_PTR_TYPE(x, type) ((x)-(type)(x) + (type)(x))
 #define PTR_TO(s, i) &((s*)0)->i
-#define OFFSETOF(s, i) ((unsigned int) PTR_TO(s, i))
+#define OFFSETOF(s, i) ((unsigned int) (uintptr_t) 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) ((uintptr_t)(p) % (s) ? (typeof(p))((uintptr_t)(p) + (s) - (uintptr_t)(p) % (s)) : (p))
@@ -155,7 +155,7 @@ timestamp_t get_timestamp(void);
 
 void init_timer(timestamp_t *timer);
 uns get_timer(timestamp_t *timer);
-uns switch_timer(timestamp_t *old, timestamp_t *new);
+uns switch_timer(timestamp_t *oldt, timestamp_t *newt);
 
 /* random.c */
 
@@ -208,7 +208,7 @@ typedef int (*ucw_sighandler_t)(int);       // gets signum, returns nonzero if abort()
 
 void handle_signal(int signum);
 void unhandle_signal(int signum);
-ucw_sighandler_t set_signal_handler(int signum, ucw_sighandler_t new);
+ucw_sighandler_t set_signal_handler(int signum, ucw_sighandler_t newh);
 
 /* bigalloc.c */