Merge branch 'master' into next

[cascardo/ovs.git] / lib / unixctl.h

diff --git a/lib/unixctl.h b/lib/unixctl.h
index 18748aa..0b6cbf3 100644 (file)
--- a/lib/unixctl.h
+++ b/lib/unixctl.h
@@ -35,9 +35,10 @@ const char *unixctl_client_target(const struct unixctl_client *);
 
 /* Command registration. */
 struct unixctl_conn;
+typedef void unixctl_cb_func(struct unixctl_conn *,
+                             const char *args, void *aux);
 void unixctl_command_register(const char *name,
-                              void (*cb)(struct unixctl_conn *,
-                                         const char *args));
+                              unixctl_cb_func *cb, void *aux);
 void unixctl_command_reply(struct unixctl_conn *, int code,
                            const char *body);