]> git.eshelyaron.com Git - emacs.git/commitdiff
Avoid reserved names in sfnt.c
authorPo Lu <luangruo@yahoo.com>
Sun, 9 Mar 2025 05:20:02 +0000 (13:20 +0800)
committerEshel Yaron <me@eshelyaron.com>
Sun, 9 Mar 2025 10:30:38 +0000 (11:30 +0100)
* 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

index 470cf1f0c88df892535ac6b9332bce5c15f1c368..6728d70dde7241e49335ffc5722f718789a77443 100644 (file)
@@ -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