From 02f04ec0aae956eaa343cda64f4c82391dbd754e Mon Sep 17 00:00:00 2001 From: "Enrico Weigelt, metux IT consult" Date: Mon, 4 Aug 2025 19:48:08 +0200 Subject: [PATCH] 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 --- glamor/glamor_utils.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/glamor/glamor_utils.h b/glamor/glamor_utils.h index a64f4dea7c..170d3a329b 100644 --- a/glamor/glamor_utils.h +++ b/glamor/glamor_utils.h @@ -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))