mirror of
https://github.com/X11Libre/xserver.git
synced 2026-11-08 04:16:22 +00:00
glamor: don't redefine ALIGN macro if it exists
On FreeBSD the ALIGN macro already exists in the standard headers, so we sholdn't redefine it here. Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
parent
04c2c107d7
commit
02f04ec0aa
1 changed files with 2 additions and 0 deletions
|
|
@ -564,7 +564,9 @@
|
|||
(c)[1] = (float)y; \
|
||||
} while(0)
|
||||
|
||||
#ifndef ALIGN /* FreeBSD already has it */
|
||||
#define ALIGN(i,m) (((i) + (m) - 1) & ~((m) - 1))
|
||||
#endif
|
||||
#define MIN(a,b) ((a) < (b) ? (a) : (b))
|
||||
#define MAX(a,b) ((a) > (b) ? (a) : (b))
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue