updates

[silc.git] / includes / silcincludes.h

diff --git a/includes/silcincludes.h b/includes/silcincludes.h
index 9117082c4a2525cb0438f0e75c1cf90e4d217dca..56e265398869b3d974007957750c024df2965c16 100644 (file)
--- a/includes/silcincludes.h
+++ b/includes/silcincludes.h
@@ -138,6 +138,10 @@
 #include <pthread.h>
 #endif
 
+#ifdef HAVE_STDDEF_H
+#include <stddef.h>
+#endif
+
 #endif                         /* !SILC_WIN32 */
 
 #ifndef HAVE_GETOPT_LONG
@@ -151,6 +155,11 @@
 #define FALSE 0
 #endif
 
+/* Define offsetof */
+#ifndef offsetof
+#define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER)
+#endif
+
 /* Define types. The types must be at least of the specified size */
 #undef uint8
 #undef uint16
@@ -237,6 +246,8 @@ typedef uint32 * void *;
 #include "silchashtable.h"
 #include "silclog.h"
 #include "silcmemory.h"
+#include "silclist.h"
+#include "silcdlist.h"
 #include "silcbuffer.h"
 #include "silcbufutil.h"
 #include "silcbuffmt.h"
@@ -258,10 +269,6 @@ typedef uint32 * void *;
 #include "silcauth.h"
 #include "silcprivate.h"
 
-/* TRQ (SilcList API and SilcDList API) */
-#include "silclist.h"
-#include "silcdlist.h"
-
 #ifdef SILC_SIM
 /* SILC Module library includes */
 #include "silcsim.h"