From 490a10f18cf7e1e5a9020f3745d9131bb66b0a74 Mon Sep 17 00:00:00 2001
From: Simon Moore <swm11@cl.cam.ac.uk>
Date: Tue, 21 Apr 2020 23:40:29 +0100
Subject: [PATCH] Simplify the definition of macro W() so that the Connectal
 dependancy checker can handle it.

---
 CHERICapWrap.bsv | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/CHERICapWrap.bsv b/CHERICapWrap.bsv
index 62a9658..dfb6aa8 100644
--- a/CHERICapWrap.bsv
+++ b/CHERICapWrap.bsv
@@ -31,11 +31,10 @@ import CHERICap :: *;
 import CHERICC_Fat :: *;
 
 `define CAPTYPE CapPipe
-`define W(name)\
-`ifndef CAP64\
-wrap128_``name\
-`else\
-wrap64_``name\
+`ifndef CAP64
+`define W(name) wrap128_``name
+`else
+`define W(name) wrap64_``name
 `endif
 
 (* noinline *)