lib/nfs/patches: disable the snprintf->sprintf_s alias

snprintf() is available on mingw, and the libnfs kludge broke the build with mingw, because sprintf_s() was now both an inline function and a "dllimport" function (because the macro renamed the inline function snprintf() to sprintf_s() in mingw's stdio.h).

lib/nfs/patches: disable the snprintf->sprintf_s alias
6a65b4c3 · Max Kellermann · a163beee · 6a65b4c3 · 6a65b4c3 · 6a65b4c3
Commit 6a65b4c3 authored Oct 17, 2020 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 16 additions and 0 deletions

libs.py python/build/libs.py +1 -0

no_sprintf_s src/lib/nfs/patches/no_sprintf_s +14 -0

series src/lib/nfs/patches/series +1 -0

No files found.
--- a/python/build/libs.py
+++ b/python/build/libs.py
@@ -429,6 +429,7 @@ libnfs = AutotoolsProject(
        '--disable-utils', '--disable-examples',
    ],
    base='libnfs-libnfs-4.0.0',
+    patches='src/lib/nfs/patches',
    autoreconf=True,
 )


--- a/src/lib/nfs/patches/no_sprintf_s
+++ b/src/lib/nfs/patches/no_sprintf_s
+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
+no_sprintf_s