[xsrc/trunk]: xsrc/external/mit/xf86-video-intel/dist/src merge changes from ...

[mrg <mrg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/xsrc/rev/357d79ca59a2
branches:  trunk
changeset: 10227:357d79ca59a2
user:      mrg <mrg%NetBSD.org@localhost>
date:      Mon Mar 18 02:12:36 2019 +0000

description:
merge changes from xorg-server 1.20 list.h into this older version.

fixes sandy bridge crashing problems for me.

diffstat:

 external/mit/xf86-video-intel/dist/src/intel_list.h |  26 ++++++++++++++++----
 1 files changed, 20 insertions(+), 6 deletions(-)

diffs (54 lines):

diff -r 36343214e41f -r 357d79ca59a2 external/mit/xf86-video-intel/dist/src/intel_list.h
--- a/external/mit/xf86-video-intel/dist/src/intel_list.h       Fri Mar 15 07:58:54 2019 +0000
+++ b/external/mit/xf86-video-intel/dist/src/intel_list.h       Mon Mar 18 02:12:36 2019 +0000
@@ -305,9 +305,20 @@
 #define list_last_entry(ptr, type, member) \
     list_entry((ptr)->prev, type, member)
 
-#define __container_of(ptr, sample, member)                            \
-    (void *)((char *)(ptr)                                             \
-            - ((char *)&(sample)->member - (char *)(sample)))
+#ifdef HAVE_TYPEOF
+#define __container_of(ptr, sample, member)                    \
+    container_of(ptr, typeof(*sample), member)
+#else
+/* This implementation of __container_of has undefined behavior according
+ * to the C standard, but it works in many cases.  If your compiler doesn't
+ * support typeof() and fails with this implementation, please try a newer
+ * compiler.
+ */
+#define __container_of(ptr, sample, member)                            \
+    (void *)((char *)(ptr)                                             \
+            - ((char *)&(sample)->member - (char *)(sample)))
+#endif
+
 /**
  * Loop through the list given by head and set pos to struct in the list.
  *
@@ -326,12 +337,14 @@
  *
  */
 #define list_for_each_entry(pos, head, member)                         \
-    for (pos = __container_of((head)->next, pos, member);              \
+    for (pos = NULL,                                                    \
+         pos = __container_of((head)->next, pos, member);              \
         &pos->member != (head);                                        \
         pos = __container_of(pos->member.next, pos, member))
 
 #define list_for_each_entry_reverse(pos, head, member)                         \
-    for (pos = __container_of((head)->prev, pos, member);              \
+    for (pos = NULL,                                                    \
+         pos = __container_of((head)->prev, pos, member);              \
         &pos->member != (head);                                        \
         pos = __container_of(pos->member.prev, pos, member))
 
@@ -343,7 +356,8 @@
  * See list_for_each_entry for more details.
  */
 #define list_for_each_entry_safe(pos, tmp, head, member)               \
-    for (pos = __container_of((head)->next, pos, member),              \
+    for (pos = NULL,                                                    \
+         pos = __container_of((head)->next, pos, member),              \
         tmp = __container_of(pos->member.next, pos, member);           \
         &pos->member != (head);                                        \
         pos = tmp, tmp = __container_of(pos->member.next, tmp, member))