Make XAnyDeviceHierarchyChangeInfo a union of the possible types.

Kinda the same as the XEvent union.

Some whitespace fixes too.

1 files changed, 10 insertions, 7 deletions

diff --git a/XInput.h b/XInput.h
index 774c496..8b28a94 100644
--- a/XInput.h
+++ b/XInput.h
@@ -999,13 +999,8 @@ typedef struct {
 
 
 /*******************************************************************
- * 
+ *
  */
-
-typedef struct {
-    int                 type;
-} XAnyHierarchyChangeInfo;
-
 typedef struct {
     int                 type;
     char*               name;
@@ -1025,9 +1020,17 @@ typedef struct {
     int                 type;
     XDevice*            device;
     int                 changeMode; /* AttachToMaster, Floating */
-    XDevice*            newMaster;                    
+    XDevice*            newMaster;
 } XChangeAttachmentInfo;
 
+typedef union {
+    int                   type; /* must be first element */
+    XCreateMasterInfo     create;
+    XRemoveMasterInfo     remove;
+    XChangeAttachmentInfo change;
+} XAnyHierarchyChangeInfo;
+
+
 /*******************************************************************
  *
  * Function definitions.