Merge "master" into "next".

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

diff --git a/lib/util.h b/lib/util.h
index afa43f6..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.
@@ -125,6 +125,10 @@ bool str_to_double(const char *, double *);
 
 int hexit_value(int c);
 
+char *dir_name(const char *file_name);
+
+void ignore(bool x OVS_UNUSED);
+
 #ifdef  __cplusplus
 }
 #endif