Merge branch 'mainstream'

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

diff --git a/lib/util.h b/lib/util.h
index 2e3d1da..9afe10e 100644 (file)
--- a/lib/util.h
+++ b/lib/util.h
@@ -310,7 +310,6 @@ char *dir_name(const char *file_name);
 char *base_name(const char *file_name);
 char *abs_file_name(const char *dir, const char *file_name);
 
-char *xreadlink(const char *filename);
 char *follow_symlinks(const char *filename);
 
 void ignore(bool x OVS_UNUSED);
@@ -492,6 +491,7 @@ uint64_t bitwise_get(const void *src, unsigned int src_len,
 
 #ifdef _WIN32
 \f
+char *ovs_format_message(int error);
 char *ovs_lasterror_to_string(void);
 #endif