Index: src/hid/common/flags.c
===================================================================
--- src/hid/common/flags.c	(revision 1259)
+++ src/hid/common/flags.c	(revision 1260)
@@ -13,7 +13,6 @@
 #include "hid.h"
 #include "../hidint.h"
 
-
 RCSID("$Id$");
 
 typedef struct HID_FlagNode {
@@ -20,6 +19,7 @@
 	struct HID_FlagNode *next;
 	HID_Flag *flags;
 	int n;
+	void *cookie;
 } HID_FlagNode;
 
 HID_FlagNode *hid_flag_nodes = 0;
@@ -26,7 +26,7 @@
 static int n_flags = 0;
 static HID_Flag *all_flags = 0;
 
-void hid_register_flags(HID_Flag * a, int n)
+void hid_register_flags(HID_Flag * a, int n, void *cookie)
 {
 	HID_FlagNode *ha;
 
@@ -43,6 +43,10 @@
 	}
 }
 
+void hid_flags_uninit(void)
+{
+}
+
 static int flag_sort(const void *va, const void *vb)
 {
 	HID_Flag *a = (HID_Flag *) va;
Index: src/hid.h
===================================================================
--- src/hid.h	(revision 1259)
+++ src/hid.h	(revision 1260)
@@ -140,9 +140,9 @@
 		int parm;
 	} HID_Flag;
 
-	extern void hid_register_flags(HID_Flag *, int);
+	extern void hid_register_flags(HID_Flag *, int, void *);
 #define REGISTER_FLAGS(a) HIDCONCAT(void register_,a) ()\
-{ hid_register_flags(a, sizeof(a)/sizeof(a[0])); }
+{ hid_register_flags(a, sizeof(a)/sizeof(a[0]), NULL); }
 
 /* Looks up one of the flags registered above.  If the flag is
    unknown, returns zero.  */