From fbaf0bb26397aa498eb9156f06d5a6fe34dd7dd8 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Fri, 19 Apr 2024 03:14:29 +0200
Subject: Merging upstream version 125.0.1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 third_party/jpeg-xl/lib/jxl/cache_aligned.cc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'third_party/jpeg-xl/lib/jxl/cache_aligned.cc')

diff --git a/third_party/jpeg-xl/lib/jxl/cache_aligned.cc b/third_party/jpeg-xl/lib/jxl/cache_aligned.cc
index 992efc4d48..8a95634d68 100644
--- a/third_party/jpeg-xl/lib/jxl/cache_aligned.cc
+++ b/third_party/jpeg-xl/lib/jxl/cache_aligned.cc
@@ -5,6 +5,7 @@
 
 #include "lib/jxl/cache_aligned.h"
 
+#include <jxl/types.h>
 #include <stdio.h>
 #include <stdlib.h>
 
@@ -95,7 +96,7 @@ void* CacheAligned::Allocate(const size_t payload_size, size_t offset) {
   aligned &= ~(kAlias - 1);
 #endif
 
-#if 0
+#if JXL_FALSE
   // No effect.
   uintptr_t page_aligned = reinterpret_cast<uintptr_t>(allocated);
   page_aligned &= ~(4096 - 1);
-- 
cgit v1.2.3