From d5be77a8f66538b438e7ab03d951fe423e6ffea3 Mon Sep 17 00:00:00 2001 From: Po Lu Date: Sun, 9 Mar 2025 13:20:02 +0800 Subject: [PATCH] Avoid reserved names in sfnt.c * src/sfnt.c (_MIN, _MAX): Rename to INS_MIN and INS_MAX. (sfnt_interpret_run): Adjust accordingly. (cherry picked from commit 1e289586fc08615031783a28e1e197071b734aaf) --- src/sfnt.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/sfnt.c b/src/sfnt.c index 470cf1f0c88..6728d70dde7 100644 --- a/src/sfnt.c +++ b/src/sfnt.c @@ -7685,7 +7685,7 @@ sfnt_interpret_trap (struct sfnt_interpreter *interpreter, PUSH_UNCHECKED (c); \ } -#define _MAX() \ +#define INS_MAX() \ { \ int32_t e1, e2; \ \ @@ -7695,7 +7695,7 @@ sfnt_interpret_trap (struct sfnt_interpreter *interpreter, PUSH_UNCHECKED (MAX (e1, e2)); \ } -#define _MIN() \ +#define INS_MIN() \ { \ int32_t e1, e2; \ \ @@ -12190,11 +12190,11 @@ sfnt_interpret_run (struct sfnt_interpreter *interpreter, break; case 0x8B: /* MAX */ - _MAX (); + INS_MAX (); break; case 0x8C: /* MIN */ - _MIN (); + INS_MIN (); break; /* Scan or dropout control is not implemented. Instead, 256 -- 2.39.5