1 files changed, 19 insertions, 7 deletions
diff --git a/src/mesa/pipe/p_util.h b/src/mesa/pipe/p_util.h
index b4d1195c9b0..e6d284d9327 100644
--- a/src/mesa/pipe/p_util.h
+++ b/src/mesa/pipe/p_util.h
@@ -169,13 +169,25 @@ align_free(void *ptr)
 static INLINE void *
 align16( void *unaligned )
 {
-   union {
-      void *p;
-      uint64 u;
-   } pu;
-   pu.p = unaligned;
-   pu.u = (pu.u + 15) & ~15;
-   return pu.p;
+   if (sizeof(void *) == 64) {
+      union {
+         void *p;
+         uint64 u;
+      } pu;
+      pu.p = unaligned;
+      pu.u = (pu.u + 15) & ~15;
+      return pu.p;
+   }
+   else {
+      /* 32-bit pointers */
+      union {
+         void *p;
+         uint u;
+      } pu;
+      pu.p = unaligned;
+      pu.u = (pu.u + 15) & ~15;
+      return pu.p;
+   }
 }