From 8554573554e392f4a629f1dd5cdb5aa4643070b5 Mon Sep 17 00:00:00 2001 From: Pekka Riikonen Date: Wed, 10 Apr 2002 13:11:08 +0000 Subject: [PATCH] updates --- lib/silcutil/silclist.h | 2 +- lib/silcutil/silctypes.h | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/lib/silcutil/silclist.h b/lib/silcutil/silclist.h index 2d56241e..76dcf692 100644 --- a/lib/silcutil/silclist.h +++ b/lib/silcutil/silclist.h @@ -117,7 +117,7 @@ typedef struct { * ***/ #define silc_list_init(list, type, field) \ - __silc_list_init(&(list), offsetof(type, field)) + __silc_list_init(&(list), silc_offsetof(type, field)) static inline void __silc_list_init(SilcList *list, int offset) { diff --git a/lib/silcutil/silctypes.h b/lib/silcutil/silctypes.h index 7c6bdd51..04a9d886 100644 --- a/lib/silcutil/silctypes.h +++ b/lib/silcutil/silctypes.h @@ -86,10 +86,7 @@ #endif /***/ -/* Define offsetof */ -#ifndef offsetof -#define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER) -#endif +#define silc_offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER) #if SILC_SIZEOF_SHORT > 2 #error "size of the short must be 2 bytes" -- 2.24.0