Merge "master" into "next".

[sliver-openvswitch.git] / lib / util.h

diff --git a/lib/util.h b/lib/util.h
index 0101bf7..562f7e0 100644 (file)
--- a/lib/util.h
+++ b/lib/util.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2009 Nicira Networks.
+ * Copyright (c) 2008, 2009, 2010 Nicira Networks.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -127,7 +127,7 @@ int hexit_value(int c);
 
 char *dir_name(const char *file_name);
 
-void ignore(bool x UNUSED);
+void ignore(bool x OVS_UNUSED);
 
 #ifdef  __cplusplus
 }