From 018872dd79202da56d36b8da7fe7d5a19c02a511 Mon Sep 17 00:00:00 2001
From: Lee Hiro <katz@cloudflare.com>
Date: Wed, 22 Mar 2023 21:08:07 +0000
Subject: [PATCH] Ported macros