diff options
| author | Ben Pfaff <blp@nicira.com> | 2013-07-29 15:24:45 -0700 |
|---|---|---|
| committer | Ben Pfaff <blp@nicira.com> | 2013-07-29 15:24:45 -0700 |
| commit | 5453ae2067671c0d40a5b3ac3cb3d4027bed6abb (patch) | |
| tree | f797fc5637955f401f5bee32c578085d31697bdc /lib/jsonrpc.c | |
| parent | 74cc3969aff34f24c093905c427471ebfb219f0c (diff) | |
Avoid C preprocessor trick where macro has the same name as a function.
In C, one can do preprocessor tricks by making a macro expansion include
the macro's own name. We actually used this in the tree to automatically
provide function arguments, e.g.:
int f(int x, const char *file, int line);
#define f(x) f(x, __FILE__, __LINE__)
...
f(1); /* Expands to a call like f(1, __FILE__, __LINE__); */
However it's somewhat confusing, so this commit stops using that trick.
Reported-by: Ed Maste <emaste@freebsd.org>
Signed-off-by: Ben Pfaff <blp@nicira.com>
Acked-by: Ed Maste <emaste@freebsd.org>
Diffstat (limited to 'lib/jsonrpc.c')
| -rw-r--r-- | lib/jsonrpc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/jsonrpc.c b/lib/jsonrpc.c index 6c482c2d..a7d89f70 100644 --- a/lib/jsonrpc.c +++ b/lib/jsonrpc.c @@ -352,7 +352,7 @@ void jsonrpc_recv_wait(struct jsonrpc *rpc) { if (rpc->status || rpc->received || !byteq_is_empty(&rpc->input)) { - (poll_immediate_wake)(rpc->name); + poll_immediate_wake_at(rpc->name); } else { stream_recv_wait(rpc->stream); } |