X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Futil%2Fu_vector.h;h=cd8a95dcbe3d9be32a1278309956e67958e1f3f1;hb=f5bec8583a568b62cf5bbdadc669ecec6b9c28cb;hp=c7fcb37a052a548db27bdce9e71bc014965e2cf1;hpb=b98ec1e92055857c08bb132a09115854d9c2248a;p=mesa.git

diff --git a/src/util/u_vector.h b/src/util/u_vector.h
index c7fcb37a052..cd8a95dcbe3 100644
--- a/src/util/u_vector.h
+++ b/src/util/u_vector.h
@@ -31,7 +31,6 @@
 
 #include <stdint.h>
 #include <stdlib.h>
-#include "util/u_math.h"
 #include "util/macros.h"
 
 /* TODO - move to u_math.h - name it better etc */
@@ -84,7 +83,7 @@ u_vector_finish(struct u_vector *queue)
 #define u_vector_foreach(elem, queue)                                  \
    STATIC_ASSERT(__builtin_types_compatible_p(__typeof__(queue), struct u_vector *)); \
    for (uint32_t __u_vector_offset = (queue)->tail;                                \
-        elem = (queue)->data + (__u_vector_offset & ((queue)->size - 1)), __u_vector_offset < (queue)->head; \
+        elem = (void *)((char *)(queue)->data + (__u_vector_offset & ((queue)->size - 1))), __u_vector_offset < (queue)->head; \
         __u_vector_offset += (queue)->element_size)