From f1757a005f471044da3f8e946a091b067996d270 Mon Sep 17 00:00:00 2001
From: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sat, 10 Dec 2022 14:30:21 -0800
Subject: Replace Opaque with direct usage of void *

Only one use was left after deleting the *alloc/free() wrappers

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
---
 utils.h   | 7 -------
 xkbcomp.h | 2 +-
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/utils.h b/utils.h
index 517ff39..0a4484b 100644
--- a/utils.h
+++ b/utils.h
@@ -47,13 +47,6 @@
 
 /***====================================================================***/
 
-#ifndef OPAQUE_DEFINED
-typedef void *Opaque;
-#endif
-#ifndef NullOpaque
-#define	NullOpaque	((Opaque)NULL)
-#endif
-
 #ifndef BOOLEAN_DEFINED
 typedef char Boolean;
 #endif
diff --git a/xkbcomp.h b/xkbcomp.h
index 67b88b3..cd077ca 100644
--- a/xkbcomp.h
+++ b/xkbcomp.h
@@ -168,7 +168,7 @@ typedef struct _Expr
         unsigned uval;
         int ival;
         char keyName[5];
-        Opaque ptr;
+        void *ptr;
     } value;
 } ExprDef;
 
-- 
cgit v1.2.3