From: fennecdjay <fennecdjay@gmail.com>
Date: Mon, 27 Feb 2023 08:45:19 +0000 (+0100)
Subject: :art: Fix #257
X-Git-Tag: nightly~202
X-Git-Url: http://10.10.0.4:5575/?a=commitdiff_plain;h=97920d7d3c184d9b708cc8897d8f3e8cb8a15999;p=gwion.git

:art: Fix #257
---

diff --git a/include/import/checker.h b/include/import/checker.h
index fbe4b50f..f81de9ff 100644
--- a/include/import/checker.h
+++ b/include/import/checker.h
@@ -1,5 +1,5 @@
-#ifndef __IMPORT_CHECKER
-#define __IMPORT_CHECKER
+#ifndef _IMPORT_CHECKER
+#define _IMPORT_CHECKER
 
 enum importck_type { ck_edef, ck_udef, ck_tdef, ck_oper, ck_item, ck_fdef };
 
diff --git a/include/import/oper.h b/include/import/oper.h
index 3e196e2d..131e96f8 100644
--- a/include/import/oper.h
+++ b/include/import/oper.h
@@ -8,13 +8,13 @@ ANN m_int gwi_oper_emi(const Gwi gwi, const opem);
 ANN2(1) m_int gwi_oper_end(const Gwi gwi, const m_str op, const f_instr f);
 ANN m_int gwi_oper_cond(const Gwi, const m_str, const f_instr, const f_instr);
 ANN void  gwi_oper_eff(const Gwi gwi, const m_str effect);
-#define _EQUALITY_OPER(sz, sign)                                               \
+#define EQUALITY_OPER_INNER(sz, sign)                                          \
   POP_REG(shred, sz * 2 - SZ_INT);                                             \
   *(m_uint *)REG(-SZ_INT) =                                                    \
       sign memcmp(shred->reg + SZ_INT, shred->reg + SZ_INT + sz, sz);
 
 #define EQUALITY_OPER(name, sz)                                                \
-  static INSTR(name##_eq) { _EQUALITY_OPER(sz, !) }                            \
-  static INSTR(name##_ne) { _EQUALITY_OPER(sz, !!) }
+  static INSTR(name##_eq) { _EQUALITY_OPER_INNER(sz, !) }                      \
+  static INSTR(name##_ne) { _EQUALITY_OPER_INNER(sz, !!) }
 
 #endif