updates

diff --git a/lib/silcutil/silclist.h b/lib/silcutil/silclist.h
index 2d56241e98ca7c03562bb30b7f8ff980d3b57c9f..76dcf69239ed1f92e490336ab2a05225671a2be6 100644 (file)
--- 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 7c6bdd514b29437993bd7fd99669e5f6436f9fd5..04a9d88672228ad7a718c69f154f2f7b62216a9b 100644 (file)
--- 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"