From 536877a84b6ba93c6c228bee27b2c82691c3d733 Mon Sep 17 00:00:00 2001
From: "Luke T. Shumaker" <lukeshu@lukeshu.com>
Date: Mon, 27 Jan 2025 21:41:39 -0700
Subject: lib9p: idl.gen: Fix is_ver

---
 lib9p/9p.generated.c |  2 +-
 lib9p/idl.gen        | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'lib9p')

diff --git a/lib9p/9p.generated.c b/lib9p/9p.generated.c
index ab39102..df81d25 100644
--- a/lib9p/9p.generated.c
+++ b/lib9p/9p.generated.c
@@ -39,7 +39,7 @@
  * (because `!CONFIG_9P_ENABLE_##ver`).  This is useful when `||`ing
  * several version checks together.
  */
-#define is_ver(ctx, ver) _is_ver_##ver(ctx->ctx->version)
+#define is_ver(CTX, ver) _is_ver_##ver(CTX->ctx->version)
 
 /* strings ********************************************************************/
 
diff --git a/lib9p/idl.gen b/lib9p/idl.gen
index 0b86246..b23b5b8 100755
--- a/lib9p/idl.gen
+++ b/lib9p/idl.gen
@@ -368,12 +368,6 @@ def gen_c(versions: set[str], typs: list[idl.Type]) -> str:
     def unused(arg: str) -> str:
         return f"LM_UNUSED({arg})"
 
-    for v in sorted(versions):
-        ret += f"#if CONFIG_9P_ENABLE_{v.replace('.', '_')}\n"
-        ret += f"\t#define _is_ver_{v.replace('.', '_')}(v) (v == {c_ver_enum(v)})\n"
-        ret += "#else\n"
-        ret += f"\t#define _is_ver_{v.replace('.', '_')}(v) false\n"
-        ret += "#endif\n"
     id2typ: dict[int, idl.Message] = {}
     for msg in [msg for msg in typs if isinstance(msg, idl.Message)]:
         id2typ[msg.msgid] = msg
@@ -400,6 +394,12 @@ def gen_c(versions: set[str], typs: list[idl.Type]) -> str:
         ret += "};\n"
         return ret
 
+    for v in sorted(versions):
+        ret += f"#if CONFIG_9P_ENABLE_{v.replace('.', '_')}\n"
+        ret += f"\t#define _is_ver_{v.replace('.', '_')}(v) (v == {c_ver_enum(v)})\n"
+        ret += "#else\n"
+        ret += f"\t#define _is_ver_{v.replace('.', '_')}(v) false\n"
+        ret += "#endif\n"
     ret += "\n"
     ret += "/**\n"
     ret += f" * is_ver(ctx, ver) is essentially `(ctx->ctx->version == {idprefix.upper()}VER_##ver)`,\n"
@@ -407,7 +407,7 @@ def gen_c(versions: set[str], typs: list[idl.Type]) -> str:
     ret += " * (because `!CONFIG_9P_ENABLE_##ver`).  This is useful when `||`ing\n"
     ret += " * several version checks together.\n"
     ret += " */\n"
-    ret += "#define is_ver(ctx, ver) _is_ver_##ver(ctx->ctx->version)\n"
+    ret += "#define is_ver(CTX, ver) _is_ver_##ver(CTX->ctx->version)\n"
 
     # strings ##################################################################
     ret += f"""
-- 
cgit v1.2.3-2-g168b