table search: cope without typeof

[disorder] / lib / table.h

diff --git a/lib/table.h b/lib/table.h
index db237acf0ff3af38c7e51920d3c2b3931bf06d00..0694fd328b1cc9084d31a911f98e0d2d8e911f21 100644 (file)
--- a/lib/table.h
+++ b/lib/table.h
@@ -1,6 +1,6 @@
 /*
  * This file is part of DisOrder
- * Copyright (C) 2004, 2005, 2007, 2008 Richard Kettlewell
+ * Copyright (C) 2004, 2005, 2007, 2008, 2013 Richard Kettlewell
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -23,9 +23,15 @@
 
 #include <stddef.h>
 
+#if _WIN32
+#define OFFSETOF_IN_OBJECT(OBJECT,FIELD) ((char *)&(OBJECT).FIELD - (char *)&(OBJECT))
+#else
+#define OFFSETOF_IN_OBJECT(OBJECT,FIELD) offsetof(typeof(OBJECT),FIELD)
+#endif
+
 #define TABLE_FIND(TABLE, FIELD, NAME)                 \
   table_find((void *)TABLE,                            \
-            offsetof(typeof((TABLE)[0]), FIELD),       \
+             OFFSETOF_IN_OBJECT(TABLE[0], FIELD),       \
             sizeof ((TABLE)[0]),                       \
             sizeof TABLE / sizeof ((TABLE)[0]),        \
             NAME)