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 /extras/ezio/tty.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 'extras/ezio/tty.c')
| -rw-r--r-- | extras/ezio/tty.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/extras/ezio/tty.c b/extras/ezio/tty.c index 9b05480a..43288285 100644 --- a/extras/ezio/tty.c +++ b/extras/ezio/tty.c @@ -374,7 +374,9 @@ tty_fork_child(int master_fd, char *argv[]) } int -tty_set_window_size(int fd UNUSED, int rows UNUSED, int columns UNUSED) +tty_set_window_size(int fd OVS_UNUSED, + int rows OVS_UNUSED, + int columns OVS_UNUSED) { #ifdef TIOCGWINSZ struct winsize win; |