mirror of
https://github.com/openvswitch/ovs
synced 2025-10-17 14:28:02 +00:00
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".
This commit is contained in:
@@ -234,13 +234,13 @@ fatal_signal_unlink_file_now(const char *file)
|
||||
}
|
||||
|
||||
static void
|
||||
unlink_files(void *aux UNUSED)
|
||||
unlink_files(void *aux OVS_UNUSED)
|
||||
{
|
||||
do_unlink_files();
|
||||
}
|
||||
|
||||
static void
|
||||
cancel_files(void *aux UNUSED)
|
||||
cancel_files(void *aux OVS_UNUSED)
|
||||
{
|
||||
shash_clear(&files);
|
||||
added_hook = false;
|
||||
|
Reference in New Issue
Block a user