projects
/
platform
/
upstream
/
mesa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
d6a8a6e
)
mesa: Undefine ALIGN macro before it is used as a function name. Issues on MacOS.
author
Duncan Hopkins
<duncan.hopkins@foundry.com>
Wed, 26 Aug 2020 16:39:56 +0000
(17:39 +0100)
committer
Duncan Hopkins
<duncan@duncanhopkins.me.uk>
Wed, 11 Nov 2020 09:09:45 +0000
(09:09 +0000)
Acked-by: Erik Faye-Lund <erik.faye-lund@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7469>
src/util/u_math.h
patch
|
blob
|
history
diff --git
a/src/util/u_math.h
b/src/util/u_math.h
index
b725489
..
2b12267
100644
(file)
--- a/
src/util/u_math.h
+++ b/
src/util/u_math.h
@@
-691,6
+691,10
@@
util_memcpy_cpu_to_le32(void * restrict dest, const void * restrict src, size_t
*
* \sa ROUND_DOWN_TO()
*/
+
+#if defined(ALIGN)
+#undef ALIGN
+#endif
static inline uintptr_t
ALIGN(uintptr_t value, int32_t alignment)
{