Merge "master" into "next".

[openvswitch] / extras / ezio / terminal.c

diff --git a/extras/ezio/terminal.c b/extras/ezio/terminal.c
index e41a987dbc99d51be5422df640a63ac3eb3645e7..090e80e44be0126625c98c90651509fcf9da7fc1 100644 (file)
--- a/extras/ezio/terminal.c
+++ b/extras/ezio/terminal.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2008, 2009 Nicira Networks, Inc.
+/* Copyright (c) 2008, 2009, 2010 Nicira Networks, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -97,7 +97,7 @@ terminal_run(struct terminal *term, struct ezio *ezio, int input_fd)
 }
 
 void
-terminal_wait(struct terminal *term UNUSED, int input_fd)
+terminal_wait(struct terminal *term OVS_UNUSED, int input_fd)
 {
     poll_fd_wait(input_fd, POLLIN);
 }