From: Ben Pfaff Date: Wed, 17 Mar 2010 21:35:56 +0000 (-0700) Subject: Merge "next" branch into "master". X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5f55c39b21e69025045437ffbd3bb98fe6ce2e89;p=openvswitch Merge "next" branch into "master". --- 5f55c39b21e69025045437ffbd3bb98fe6ce2e89 diff --cc lib/unixctl.h index 24a9d8c8,0b6cbf33..89199bb6 --- a/lib/unixctl.h +++ b/lib/unixctl.h @@@ -39,14 -35,11 +39,15 @@@ const char *unixctl_client_target(cons /* 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); + +#ifdef __cplusplus +} +#endif #endif /* unixctl.h */