From 76f79db3f5d8492370c92080b5bbea7e31827b75 Mon Sep 17 00:00:00 2001
From: Marek Olšák <marek.olsak@amd.com>
Date: Wed, 25 Mar 2020 21:26:24 -0400
Subject: util: stop including files from mesa/main

Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4324>
---
 src/util/register_allocate.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src/util/register_allocate.c')

diff --git a/src/util/register_allocate.c b/src/util/register_allocate.c
index 9c654080a09..af43c2fbb43 100644
--- a/src/util/register_allocate.c
+++ b/src/util/register_allocate.c
@@ -71,11 +71,12 @@
  */
 
 #include <stdbool.h>
+#include <limits.h>
 
 #include "ralloc.h"
 #include "util/imports.h"
-#include "main/macros.h"
 #include "util/bitset.h"
+#include "u_math.h"
 #include "register_allocate.h"
 
 struct ra_reg {
@@ -496,7 +497,7 @@ ra_realloc_interference_graph(struct ra_graph *g, unsigned int alloc)
     * easier to memset the top of the growing bitsets.
     */
    assert(g->alloc % BITSET_WORDBITS == 0);
-   alloc = ALIGN(alloc, BITSET_WORDBITS);
+   alloc = align64(alloc, BITSET_WORDBITS);
 
    g->nodes = reralloc(g, g->nodes, struct ra_node, alloc);
 
-- 
cgit v1.2.3