projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
gallium,util: undef ALIGN on FreeBSD to prevent name clash
[mesa.git]
/
src
/
gallium
/
winsys
/
sw
/
dri
/
dri_sw_winsys.c
diff --git
a/src/gallium/winsys/sw/dri/dri_sw_winsys.c
b/src/gallium/winsys/sw/dri/dri_sw_winsys.c
index c889e968534fb6b88340c843852f20d925da42f3..f9ff6d25d730138c2dfc19d9354461d1607c6664 100644
(file)
--- a/
src/gallium/winsys/sw/dri/dri_sw_winsys.c
+++ b/
src/gallium/winsys/sw/dri/dri_sw_winsys.c
@@
-29,6
+29,12
@@
#ifdef HAVE_SYS_SHM_H
#include <sys/ipc.h>
#include <sys/shm.h>
+#ifdef __FreeBSD__
+/* sys/ipc.h -> sys/_types.h -> machine/param.h
+ * - defines ALIGN which clashes with our ALIGN
+ */
+#undef ALIGN
+#endif
#endif
#include "pipe/p_compiler.h"