diff options
| author | Ben Pfaff <blp@nicira.com> | 2010-02-11 11:11:23 -0800 |
|---|---|---|
| committer | Ben Pfaff <blp@nicira.com> | 2010-02-11 11:11:23 -0800 |
| commit | c69ee87c10818267f991236201150b1fa51ae519 (patch) | |
| tree | abea72de06ca718ef0296b88ee84a1bf889fed8c /lib/stream-tcp.c | |
| parent | 62ee3464d99c0e37f38b503321cd46181c5c7617 (diff) | |
| parent | 67a4917b07031b387beafaedce413b4207214059 (diff) | |
Merge "master" into "next".
The main change here is the need to update all of the uses of UNUSED in
the next branch to OVS_UNUSED as it is now spelled on "master".
Diffstat (limited to 'lib/stream-tcp.c')
| -rw-r--r-- | lib/stream-tcp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/stream-tcp.c b/lib/stream-tcp.c index e690e9c5..a9bcaeb4 100644 --- a/lib/stream-tcp.c +++ b/lib/stream-tcp.c @@ -101,7 +101,7 @@ static int ptcp_accept(int fd, const struct sockaddr *sa, size_t sa_len, struct stream **streamp); static int -ptcp_open(const char *name UNUSED, char *suffix, struct pstream **pstreamp) +ptcp_open(const char *name OVS_UNUSED, char *suffix, struct pstream **pstreamp) { struct sockaddr_in sin; char bound_name[128]; |