Merge tag 'v0.22.1' into master

release v0.22.1
2020-10-17 13:58:36 +02:00
parent 4f0e0af319 d7fcaf33b9
commit 172c2ae1aa
4 changed files with 17 additions and 1 deletions
--- a/src/lib/nfs/patches/no_sprintf_s
+++ b/src/lib/nfs/patches/no_sprintf_s
@@ -0,0 +1,14 @@
+Index: libnfs-libnfs-4.0.0/include/win32/win32_compat.h
+===================================================================
+--- libnfs-libnfs-4.0.0.orig/include/win32/win32_compat.h
+++ libnfs-libnfs-4.0.0/include/win32/win32_compat.h
+@@ -133,7 +133,9 @@ struct pollfd {
+ 
+ /* Wrapper macros to call misc. functions win32 is missing */
+ #define poll(x, y, z)        win32_poll(x, y, z)
+#ifndef __MINGW32__
+ #define snprintf             sprintf_s
+#endif
+ #define inet_pton(x,y,z)     win32_inet_pton(x,y,z)
+ #define open(x, y, z)        _open(x, y, z)
+ #ifndef lseek
--- a/src/lib/nfs/patches/series
+++ b/src/lib/nfs/patches/series
@@ -0,0 +1 @@
+no_sprintf_s